From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 31 Jul 2025 21:12:17 +0000 (-0500)
Subject: Merge branch 'pci/controller/rockchip-host'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=090fc11428a3c0636c23b7f8368446b719ee79c2;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/controller/rockchip-host'

- Fix log message that said "malformed TLP" when it should have said
  "Unexpected Completion" (Hans Zhang)

- Fix log message that said "no fatal error" when it should have said "non
  fatal error" (Hans Zhang)

- Remove several unused header includes (Hans Zhang)

* pci/controller/rockchip-host:
  PCI: rockchip-host: Remove unused header includes
  PCI: rockchip-host: Correct non-fatal error log message
  PCI: rockchip-host: Fix "Unexpected Completion" log message
---

090fc11428a3c0636c23b7f8368446b719ee79c2
diff --cc drivers/pci/controller/pcie-rockchip-host.c
index a00b55f6716de,9b5a4e1de73d8..ee1822ca01db3
--- a/drivers/pci/controller/pcie-rockchip-host.c
+++ b/drivers/pci/controller/pcie-rockchip-host.c
@@@ -11,12 -11,8 +11,9 @@@
   * ARM PCI Host generic driver.
   */
  
 +#include <linux/bitfield.h>
  #include <linux/bitrev.h>
- #include <linux/clk.h>
- #include <linux/delay.h>
  #include <linux/gpio/consumer.h>
- #include <linux/init.h>
  #include <linux/interrupt.h>
  #include <linux/iopoll.h>
  #include <linux/irq.h>