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

PCI: Add wrappers for dev_printk() 



Add PCI-specific dev_printk() wrappers and use them to simplify the code
slightly.  No functional change intended.

Signed-off-by: default avatarFrederick Lawler <fred@fredlawl.com>
[bhelgaas: squash into one patch]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent c7abb235

drivers/pci/access.c

+3 −5
Original line number Diff line number Diff line
@@ -333,8 +333,7 @@ static size_t pci_vpd_size(struct pci_dev *dev, size_t old_size) 
			    (tag == PCI_VPD_LTIN_RW_DATA)) {

				if (pci_read_vpd(dev, off+1, 2,

						 &header[1]) != 2) {

					dev_warn(&dev->dev,

						 "invalid large VPD tag %02x size at offset %zu",

					pci_warn(dev, "invalid large VPD tag %02x size at offset %zu",

						 tag, off + 1);

					return 0;

				}
@@ -354,8 +353,7 @@ static size_t pci_vpd_size(struct pci_dev *dev, size_t old_size) 
		if ((tag != PCI_VPD_LTIN_ID_STRING) &&

		    (tag != PCI_VPD_LTIN_RO_DATA) &&

		    (tag != PCI_VPD_LTIN_RW_DATA)) {

			dev_warn(&dev->dev,

				 "invalid %s VPD tag %02x at offset %zu",

			pci_warn(dev, "invalid %s VPD tag %02x at offset %zu",

				 (header[0] & PCI_VPD_LRDT) ? "large" : "short",

				 tag, off);

			return 0;
@@ -402,7 +400,7 @@ static int pci_vpd_wait(struct pci_dev *dev) 
			max_sleep *= 2;

	}



	dev_warn(&dev->dev, "VPD access failed.  This is likely a firmware bug on this device.  Contact the card vendor for a firmware update\n");

	pci_warn(dev, "VPD access failed.  This is likely a firmware bug on this device.  Contact the card vendor for a firmware update\n");

	return -ETIMEDOUT;

}

drivers/pci/bus.c

+2 −2
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ bool pci_bus_clip_resource(struct pci_dev *dev, int idx) 
		res->end = end;

		res->flags &= ~IORESOURCE_UNSET;

		orig_res.flags &= ~IORESOURCE_UNSET;

		dev_printk(KERN_DEBUG, &dev->dev, "%pR clipped to %pR\n",

		pci_printk(KERN_DEBUG, dev, "%pR clipped to %pR\n",

				 &orig_res, res);



		return true;
@@ -325,7 +325,7 @@ void pci_bus_add_device(struct pci_dev *dev) 
	dev->match_driver = true;

	retval = device_attach(&dev->dev);

	if (retval < 0 && retval != -EPROBE_DEFER) {

		dev_warn(&dev->dev, "device attach failed (%d)\n", retval);

		pci_warn(dev, "device attach failed (%d)\n", retval);

		pci_proc_detach_device(dev);

		pci_remove_sysfs_dev_files(dev);

		return;

drivers/pci/hotplug/cpqphp_core.c

+1 −1
Original line number Diff line number Diff line
@@ -835,7 +835,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	bus = pdev->subordinate;

	if (!bus) {

		dev_notice(&pdev->dev, "the device is not a bridge, skipping\n");

		pci_notice(pdev, "the device is not a bridge, skipping\n");

		rc = -ENODEV;

		goto err_disable_device;

	}

drivers/pci/hotplug/pnv_php.c

+16 −20
Original line number Diff line number Diff line
@@ -271,8 +271,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot) 


	ret = pnv_pci_get_device_tree(php_slot->dn->phandle, fdt1, 0x10000);

	if (ret) {

		dev_warn(&php_slot->pdev->dev, "Error %d getting FDT blob\n",

			 ret);

		pci_warn(php_slot->pdev, "Error %d getting FDT blob\n", ret);

		goto free_fdt1;

	}
@@ -287,7 +286,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot) 
	dt = of_fdt_unflatten_tree(fdt, php_slot->dn, NULL);

	if (!dt) {

		ret = -EINVAL;

		dev_warn(&php_slot->pdev->dev, "Cannot unflatten FDT\n");

		pci_warn(php_slot->pdev, "Cannot unflatten FDT\n");

		goto free_fdt;

	}
@@ -297,7 +296,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot) 
	ret = pnv_php_populate_changeset(&php_slot->ocs, php_slot->dn);

	if (ret) {

		pnv_php_reverse_nodes(php_slot->dn);

		dev_warn(&php_slot->pdev->dev, "Error %d populating changeset\n",

		pci_warn(php_slot->pdev, "Error %d populating changeset\n",

			 ret);

		goto free_dt;

	}
@@ -305,8 +304,7 @@ static int pnv_php_add_devtree(struct pnv_php_slot *php_slot) 
	php_slot->dn->child = NULL;

	ret = of_changeset_apply(&php_slot->ocs);

	if (ret) {

		dev_warn(&php_slot->pdev->dev, "Error %d applying changeset\n",

			 ret);

		pci_warn(php_slot->pdev, "Error %d applying changeset\n", ret);

		goto destroy_changeset;

	}
@@ -342,14 +340,14 @@ int pnv_php_set_slot_power_state(struct hotplug_slot *slot, 
		if (be64_to_cpu(msg.params[1]) != php_slot->dn->phandle	||

		    be64_to_cpu(msg.params[2]) != state			||

		    be64_to_cpu(msg.params[3]) != OPAL_SUCCESS) {

			dev_warn(&php_slot->pdev->dev, "Wrong msg (%lld, %lld, %lld)\n",

			pci_warn(php_slot->pdev, "Wrong msg (%lld, %lld, %lld)\n",

				 be64_to_cpu(msg.params[1]),

				 be64_to_cpu(msg.params[2]),

				 be64_to_cpu(msg.params[3]));

			return -ENOMSG;

		}

	} else if (ret < 0) {

		dev_warn(&php_slot->pdev->dev, "Error %d powering %s\n",

		pci_warn(php_slot->pdev, "Error %d powering %s\n",

			 ret, (state == OPAL_PCI_SLOT_POWER_ON) ? "on" : "off");

		return ret;

	}
@@ -376,7 +374,7 @@ static int pnv_php_get_power_state(struct hotplug_slot *slot, u8 *state) 
	 */

	ret = pnv_pci_get_power_state(php_slot->id, &power_state);

	if (ret) {

		dev_warn(&php_slot->pdev->dev, "Error %d getting power status\n",

		pci_warn(php_slot->pdev, "Error %d getting power status\n",

			 ret);

	} else {

		*state = power_state;
@@ -402,8 +400,7 @@ static int pnv_php_get_adapter_state(struct hotplug_slot *slot, u8 *state) 
		slot->info->adapter_status = presence;

		ret = 0;

	} else {

		dev_warn(&php_slot->pdev->dev, "Error %d getting presence\n",

			 ret);

		pci_warn(php_slot->pdev, "Error %d getting presence\n", ret);

	}



	return ret;
@@ -626,8 +623,7 @@ static int pnv_php_register_slot(struct pnv_php_slot *php_slot) 
	ret = pci_hp_register(&php_slot->slot, php_slot->bus,

			      php_slot->slot_no, php_slot->name);

	if (ret) {

		dev_warn(&php_slot->pdev->dev, "Error %d registering slot\n",

			 ret);

		pci_warn(php_slot->pdev, "Error %d registering slot\n", ret);

		return ret;

	}
@@ -680,7 +676,7 @@ static int pnv_php_enable_msix(struct pnv_php_slot *php_slot) 
	/* Enable MSIx */

	ret = pci_enable_msix_exact(pdev, &entry, 1);

	if (ret) {

		dev_warn(&pdev->dev, "Error %d enabling MSIx\n", ret);

		pci_warn(pdev, "Error %d enabling MSIx\n", ret);

		return ret;

	}
@@ -724,7 +720,7 @@ static irqreturn_t pnv_php_interrupt(int irq, void *data) 
		   (sts & PCI_EXP_SLTSTA_PDC)) {

		ret = pnv_pci_get_presence_state(php_slot->id, &presence);

		if (ret) {

			dev_warn(&pdev->dev, "PCI slot [%s] error %d getting presence (0x%04x), to retry the operation.\n",

			pci_warn(pdev, "PCI slot [%s] error %d getting presence (0x%04x), to retry the operation.\n",

				 php_slot->name, ret, sts);

			return IRQ_HANDLED;

		}
@@ -754,12 +750,12 @@ static irqreturn_t pnv_php_interrupt(int irq, void *data) 
	 */

	event = kzalloc(sizeof(*event), GFP_ATOMIC);

	if (!event) {

		dev_warn(&pdev->dev, "PCI slot [%s] missed hotplug event 0x%04x\n",

		pci_warn(pdev, "PCI slot [%s] missed hotplug event 0x%04x\n",

			 php_slot->name, sts);

		return IRQ_HANDLED;

	}



	dev_info(&pdev->dev, "PCI slot [%s] %s (IRQ: %d)\n",

	pci_info(pdev, "PCI slot [%s] %s (IRQ: %d)\n",

		 php_slot->name, added ? "added" : "removed", irq);

	INIT_WORK(&event->work, pnv_php_event_handler);

	event->added = added;
@@ -779,7 +775,7 @@ static void pnv_php_init_irq(struct pnv_php_slot *php_slot, int irq) 
	/* Allocate workqueue */

	php_slot->wq = alloc_workqueue("pciehp-%s", 0, 0, php_slot->name);

	if (!php_slot->wq) {

		dev_warn(&pdev->dev, "Cannot alloc workqueue\n");

		pci_warn(pdev, "Cannot alloc workqueue\n");

		pnv_php_disable_irq(php_slot, true);

		return;

	}
@@ -803,7 +799,7 @@ static void pnv_php_init_irq(struct pnv_php_slot *php_slot, int irq) 
			  php_slot->name, php_slot);

	if (ret) {

		pnv_php_disable_irq(php_slot, true);

		dev_warn(&pdev->dev, "Error %d enabling IRQ %d\n", ret, irq);

		pci_warn(pdev, "Error %d enabling IRQ %d\n", ret, irq);

		return;

	}
@@ -839,7 +835,7 @@ static void pnv_php_enable_irq(struct pnv_php_slot *php_slot) 


	ret = pci_enable_device(pdev);

	if (ret) {

		dev_warn(&pdev->dev, "Error %d enabling device\n", ret);

		pci_warn(pdev, "Error %d enabling device\n", ret);

		return;

	}

drivers/pci/hotplug/sgi_hotplug.c

+18 −18
Original line number Diff line number Diff line
@@ -245,18 +245,18 @@ static int sn_slot_enable(struct hotplug_slot *bss_hotplug_slot, 




	if (rc == PCI_SLOT_ALREADY_UP) {

		dev_dbg(&slot->pci_bus->self->dev, "is already active\n");

		pci_dbg(slot->pci_bus->self, "is already active\n");

		return 1; /* return 1 to user */

	}



	if (rc == PCI_L1_ERR) {

		dev_dbg(&slot->pci_bus->self->dev, "L1 failure %d with message: %s",

		pci_dbg(slot->pci_bus->self, "L1 failure %d with message: %s",

			resp.resp_sub_errno, resp.resp_l1_msg);

		return -EPERM;

	}



	if (rc) {

		dev_dbg(&slot->pci_bus->self->dev, "insert failed with error %d sub-error %d\n",

		pci_dbg(slot->pci_bus->self, "insert failed with error %d sub-error %d\n",

			rc, resp.resp_sub_errno);

		return -EIO;

	}
@@ -281,23 +281,23 @@ static int sn_slot_disable(struct hotplug_slot *bss_hotplug_slot, 


	if ((action == PCI_REQ_SLOT_ELIGIBLE) &&

	    (rc == PCI_SLOT_ALREADY_DOWN)) {

		dev_dbg(&slot->pci_bus->self->dev, "Slot %s already inactive\n", slot->physical_path);

		pci_dbg(slot->pci_bus->self, "Slot %s already inactive\n", slot->physical_path);

		return 1; /* return 1 to user */

	}



	if ((action == PCI_REQ_SLOT_ELIGIBLE) && (rc == PCI_EMPTY_33MHZ)) {

		dev_dbg(&slot->pci_bus->self->dev, "Cannot remove last 33MHz card\n");

		pci_dbg(slot->pci_bus->self, "Cannot remove last 33MHz card\n");

		return -EPERM;

	}



	if ((action == PCI_REQ_SLOT_ELIGIBLE) && (rc == PCI_L1_ERR)) {

		dev_dbg(&slot->pci_bus->self->dev, "L1 failure %d with message \n%s\n",

		pci_dbg(slot->pci_bus->self, "L1 failure %d with message \n%s\n",

			resp.resp_sub_errno, resp.resp_l1_msg);

		return -EPERM;

	}



	if ((action == PCI_REQ_SLOT_ELIGIBLE) && rc) {

		dev_dbg(&slot->pci_bus->self->dev, "remove failed with error %d sub-error %d\n",

		pci_dbg(slot->pci_bus->self, "remove failed with error %d sub-error %d\n",

			rc, resp.resp_sub_errno);

		return -EIO;

	}
@@ -308,12 +308,12 @@ static int sn_slot_disable(struct hotplug_slot *bss_hotplug_slot, 
	if ((action == PCI_REQ_SLOT_DISABLE) && !rc) {

		pcibus_info = SN_PCIBUS_BUSSOFT_INFO(slot->pci_bus);

		pcibus_info->pbi_enabled_devices &= ~(1 << device_num);

		dev_dbg(&slot->pci_bus->self->dev, "remove successful\n");

		pci_dbg(slot->pci_bus->self, "remove successful\n");

		return 0;

	}



	if ((action == PCI_REQ_SLOT_DISABLE) && rc) {

		dev_dbg(&slot->pci_bus->self->dev, "remove failed rc = %d\n", rc);

		pci_dbg(slot->pci_bus->self, "remove failed rc = %d\n", rc);

	}



	return rc;
@@ -366,7 +366,7 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot) 
	num_funcs = pci_scan_slot(slot->pci_bus,

				  PCI_DEVFN(slot->device_num + 1, 0));

	if (!num_funcs) {

		dev_dbg(&slot->pci_bus->self->dev, "no device in slot\n");

		pci_dbg(slot->pci_bus->self, "no device in slot\n");

		mutex_unlock(&sn_hotplug_mutex);

		return -ENODEV;

	}
@@ -412,7 +412,7 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot) 
		phandle = acpi_device_handle(PCI_CONTROLLER(slot->pci_bus)->companion);



		if (acpi_bus_get_device(phandle, &pdevice)) {

			dev_dbg(&slot->pci_bus->self->dev, "no parent device, assuming NULL\n");

			pci_dbg(slot->pci_bus->self, "no parent device, assuming NULL\n");

			pdevice = NULL;

		}
@@ -463,9 +463,9 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot) 
	mutex_unlock(&sn_hotplug_mutex);



	if (rc == 0)

		dev_dbg(&slot->pci_bus->self->dev, "insert operation successful\n");

		pci_dbg(slot->pci_bus->self, "insert operation successful\n");

	else

		dev_dbg(&slot->pci_bus->self->dev, "insert operation failed rc = %d\n", rc);

		pci_dbg(slot->pci_bus->self, "insert operation failed rc = %d\n", rc);



	return rc;

}
@@ -643,16 +643,16 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus) 
		if (rc)

			goto register_err;

	}

	dev_dbg(&pci_bus->self->dev, "Registered bus with hotplug\n");

	pci_dbg(pci_bus->self, "Registered bus with hotplug\n");

	return rc;



register_err:

	dev_dbg(&pci_bus->self->dev, "bus failed to register with err = %d\n",

	pci_dbg(pci_bus->self, "bus failed to register with err = %d\n",

		rc);



alloc_err:

	if (rc == -ENOMEM)

		dev_dbg(&pci_bus->self->dev, "Memory allocation error\n");

		pci_dbg(pci_bus->self, "Memory allocation error\n");



	/* destroy THIS element */

	if (bss_hotplug_slot)
@@ -685,10 +685,10 @@ static int __init sn_pci_hotplug_init(void) 


		rc = sn_pci_bus_valid(pci_bus);

		if (rc != 1) {

			dev_dbg(&pci_bus->self->dev, "not a valid hotplug bus\n");

			pci_dbg(pci_bus->self, "not a valid hotplug bus\n");

			continue;

		}

		dev_dbg(&pci_bus->self->dev, "valid hotplug bus\n");

		pci_dbg(pci_bus->self, "valid hotplug bus\n");



		rc = sn_hotplug_slot_register(pci_bus);

		if (!rc) {