Commit d5579183 authored by Frederick Lawler's avatar Frederick Lawler Committed by Bjorn Helgaas
Browse files

PCI/AER: Replace dev_printk(KERN_DEBUG) with dev_info() 

Replace dev_printk(KERN_DEBUG) with dev_info() or dev_err() to be more
consistent with other logging.

These could be converted to dev_dbg(), but that depends on
CONFIG_DYNAMIC_DEBUG and DEBUG, and we want most of these messages to
*always* be in the dmesg log.

Also remove a redundant kzalloc() failure message.

Link: https://lore.kernel.org/lkml/20190509141456.223614-2-helgaas@kernel.org


Signed-off-by: default avatarFrederick Lawler <fred@fredlawl.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
parent 9e98c678

drivers/pci/pcie/aer.c

+5 −8
Original line number Diff line number Diff line
@@ -964,8 +964,7 @@ static bool find_source_device(struct pci_dev *parent, 
	pci_walk_bus(parent->subordinate, find_device_iter, e_info);



	if (!e_info->error_dev_num) {

		pci_printk(KERN_DEBUG, parent, "can't find device of ID%04x\n",

			   e_info->id);

		pci_info(parent, "can't find device of ID%04x\n", e_info->id);

		return false;

	}

	return true;
@@ -1379,18 +1378,16 @@ static int aer_probe(struct pcie_device *dev) 
	struct device *device = &dev->device;



	rpc = devm_kzalloc(device, sizeof(struct aer_rpc), GFP_KERNEL);

	if (!rpc) {

		dev_printk(KERN_DEBUG, device, "alloc AER rpc failed\n");

	if (!rpc)

		return -ENOMEM;

	}



	rpc->rpd = dev->port;

	set_service_data(dev, rpc);



	status = devm_request_threaded_irq(device, dev->irq, aer_irq, aer_isr,

					   IRQF_SHARED, "aerdrv", dev);

	if (status) {

		dev_printk(KERN_DEBUG, device, "request AER IRQ %d failed\n",

			   dev->irq);

		dev_err(device, "request AER IRQ %d failed\n", dev->irq);

		return status;

	}
@@ -1419,7 +1416,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev) 
	pci_write_config_dword(dev, pos + PCI_ERR_ROOT_COMMAND, reg32);



	rc = pci_bus_error_reset(dev);

	pci_printk(KERN_DEBUG, dev, "Root Port link has been reset\n");

	pci_info(dev, "Root Port link has been reset\n");



	/* Clear Root Error Status */

	pci_read_config_dword(dev, pos + PCI_ERR_ROOT_STATUS, &reg32);

CRA Git | Maintained and supported by SUSTech CRA and CCSE