Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34ef30ca authored by Tony Luck's avatar Tony Luck
Browse files

[IA64] Fix warnings resulting from type-checking in dev_dbg() 



Lots of places where we passed a "struct pci_device *" rather than
a "struct device *".  One place where we used a "%s" in the format,
but forgot to provide an argument.

Acked-by: default avatarJohn Keller <jpk@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 8ee4dc39

arch/ia64/sn/kernel/io_common.c

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ void sn_bus_store_sysdata(struct pci_dev *dev) 


	element = kzalloc(sizeof(struct sysdata_el), GFP_KERNEL);

	if (!element) {

		dev_dbg(dev, "%s: out of memory!\n", __FUNCTION__);

		dev_dbg(&dev->dev, "%s: out of memory!\n", __FUNCTION__);

		return;

	}

	element->sysdata = SN_PCIDEV_INFO(dev);

drivers/pci/hotplug/sgi_hotplug.c

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




	if (rc == PCI_SLOT_ALREADY_UP) {

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

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

		return 1; /* return 1 to user */

	}



	if (rc == PCI_L1_ERR) {

		dev_dbg(slot->pci_bus->self,

		dev_dbg(&slot->pci_bus->self->dev,

			"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_dbg(&slot->pci_bus->self->dev,

			"insert failed with error %d sub-error %d\n",

			rc, resp.resp_sub_errno);

		return -EIO;
@@ -287,25 +287,25 @@ 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, "Slot %s already inactive\n");

		dev_dbg(&slot->pci_bus->self->dev, "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_dbg(&slot->pci_bus->self->dev,

			"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_dbg(&slot->pci_bus->self->dev,

			"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_dbg(&slot->pci_bus->self->dev,

			"remove failed with error %d sub-error %d\n",

			rc, resp.resp_sub_errno);

		return -EIO;
@@ -317,12 +317,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, "remove successful\n");

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

		return 0;

	}



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

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

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

	}



	return rc;
@@ -375,7 +375,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, "no device in slot\n");

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

		mutex_unlock(&sn_hotplug_mutex);

		return -ENODEV;

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



		if (acpi_bus_get_device(phandle, &pdevice)) {

			dev_dbg(slot->pci_bus->self,

			dev_dbg(&slot->pci_bus->self->dev,

				"no parent device, assuming NULL\n");

			pdevice = NULL;

		}
@@ -479,10 +479,10 @@ 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_dbg(&slot->pci_bus->self->dev,

			"insert operation successful\n");

	else

		dev_dbg(slot->pci_bus->self,

		dev_dbg(&slot->pci_bus->self->dev,

			"insert operation failed rc = %d\n", rc);



	return rc;
@@ -659,16 +659,16 @@ static int sn_hotplug_slot_register(struct pci_bus *pci_bus) 
		if (rc)

			goto register_err;

	}

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

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

	return rc;



register_err:

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

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

	        rc);



alloc_err:

	if (rc == -ENOMEM)

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

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



	/* destroy THIS element */

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


		rc = sn_pci_bus_valid(pci_bus);

		if (rc != 1) {

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

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

			continue;

		}

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

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



		rc = sn_hotplug_slot_register(pci_bus);

		if (!rc) {