Commit 090fc114 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents 90eb421c 1fdb13f9

drivers/pci/controller/pcie-rockchip-host.c

+2 −11
Original line number Diff line number Diff line
@@ -13,26 +13,17 @@ 


#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>

#include <linux/irqchip/chained_irq.h>

#include <linux/irqdomain.h>

#include <linux/kernel.h>

#include <linux/mfd/syscon.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_pci.h>

#include <linux/pci.h>

#include <linux/pci_ids.h>

#include <linux/phy/phy.h>

#include <linux/platform_device.h>

#include <linux/reset.h>

#include <linux/regmap.h>



#include "../pci.h"

#include "pcie-rockchip.h"
@@ -444,7 +435,7 @@ static irqreturn_t rockchip_pcie_subsys_irq_handler(int irq, void *arg) 
			dev_dbg(dev, "malformed TLP received from the link\n");



		if (sub_reg & PCIE_CORE_INT_UCR)

			dev_dbg(dev, "malformed TLP received from the link\n");

			dev_dbg(dev, "Unexpected Completion received from the link\n");



		if (sub_reg & PCIE_CORE_INT_FCE)

			dev_dbg(dev, "an error was observed in the flow control advertisements from the other side\n");
@@ -494,7 +485,7 @@ static irqreturn_t rockchip_pcie_client_irq_handler(int irq, void *arg) 
		dev_dbg(dev, "fatal error interrupt received\n");



	if (reg & PCIE_CLIENT_INT_NFATAL_ERR)

		dev_dbg(dev, "no fatal error interrupt received\n");

		dev_dbg(dev, "non fatal error interrupt received\n");



	if (reg & PCIE_CLIENT_INT_CORR_ERR)

		dev_dbg(dev, "correctable error interrupt received\n");