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

Commit e4de866a authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk
Browse files

xen/pci[front|back]: Use %d instead of %1x for displaying PCI devfn. 



.. as the rest of the kernel is using that format.

Suggested-by: default avatarМарк Коренберг <socketpair@gmail.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 207d543f

drivers/pci/xen-pcifront.c

+5 −5
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static int pcifront_bus_read(struct pci_bus *bus, unsigned int devfn, 


	if (verbose_request)

		dev_info(&pdev->xdev->dev,

			 "read dev=%04x:%02x:%02x.%01x - offset %x size %d\n",

			 "read dev=%04x:%02x:%02x.%d - offset %x size %d\n",

			 pci_domain_nr(bus), bus->number, PCI_SLOT(devfn),

			 PCI_FUNC(devfn), where, size);
@@ -228,7 +228,7 @@ static int pcifront_bus_write(struct pci_bus *bus, unsigned int devfn, 


	if (verbose_request)

		dev_info(&pdev->xdev->dev,

			 "write dev=%04x:%02x:%02x.%01x - "

			 "write dev=%04x:%02x:%02x.%d - "

			 "offset %x size %d val %x\n",

			 pci_domain_nr(bus), bus->number,

			 PCI_SLOT(devfn), PCI_FUNC(devfn), where, size, val);
@@ -432,7 +432,7 @@ static int __devinit pcifront_scan_bus(struct pcifront_device *pdev, 
		d = pci_scan_single_device(b, devfn);

		if (d)

			dev_info(&pdev->xdev->dev, "New device on "

				 "%04x:%02x:%02x.%02x found.\n", domain, bus,

				 "%04x:%02x:%02x.%d found.\n", domain, bus,

				 PCI_SLOT(devfn), PCI_FUNC(devfn));

	}
@@ -1041,7 +1041,7 @@ static int pcifront_detach_devices(struct pcifront_device *pdev) 
		pci_dev = pci_get_slot(pci_bus, PCI_DEVFN(slot, func));

		if (!pci_dev) {

			dev_dbg(&pdev->xdev->dev,

				"Cannot get PCI device %04x:%02x:%02x.%02x\n",

				"Cannot get PCI device %04x:%02x:%02x.%d\n",

				domain, bus, slot, func);

			continue;

		}
@@ -1049,7 +1049,7 @@ static int pcifront_detach_devices(struct pcifront_device *pdev) 
		pci_dev_put(pci_dev);



		dev_dbg(&pdev->xdev->dev,

			"PCI device %04x:%02x:%02x.%02x removed.\n",

			"PCI device %04x:%02x:%02x.%d removed.\n",

			domain, bus, slot, func);

	}

drivers/xen/xen-pciback/pci_stub.c

+4 −4
Original line number Diff line number Diff line
@@ -884,7 +884,7 @@ static inline int str_to_quirk(const char *buf, int *domain, int *bus, int 
	int err;



	err =

	    sscanf(buf, " %04x:%02x:%02x.%1x-%08x:%1x:%08x", domain, bus, slot,

	    sscanf(buf, " %04x:%02x:%02x.%d-%08x:%1x:%08x", domain, bus, slot,

		   func, reg, size, mask);

	if (err == 7)

		return 0;
@@ -904,7 +904,7 @@ static int pcistub_device_id_add(int domain, int bus, int slot, int func) 
	pci_dev_id->bus = bus;

	pci_dev_id->devfn = PCI_DEVFN(slot, func);



	pr_debug(DRV_NAME ": wants to seize %04x:%02x:%02x.%01x\n",

	pr_debug(DRV_NAME ": wants to seize %04x:%02x:%02x.%d\n",

		 domain, bus, slot, func);



	spin_lock_irqsave(&device_ids_lock, flags);
@@ -934,7 +934,7 @@ static int pcistub_device_id_remove(int domain, int bus, int slot, int func) 


			err = 0;



			pr_debug(DRV_NAME ": removed %04x:%02x:%02x.%01x from "

			pr_debug(DRV_NAME ": removed %04x:%02x:%02x.%d from "

				 "seize list\n", domain, bus, slot, func);

		}

	}
@@ -1029,7 +1029,7 @@ static ssize_t pcistub_slot_show(struct device_driver *drv, char *buf) 
			break;



		count += scnprintf(buf + count, PAGE_SIZE - count,

				   "%04x:%02x:%02x.%01x\n",

				   "%04x:%02x:%02x.%d\n",

				   pci_dev_id->domain, pci_dev_id->bus,

				   PCI_SLOT(pci_dev_id->devfn),

				   PCI_FUNC(pci_dev_id->devfn));

drivers/xen/xen-pciback/xenbus.c

+3 −2
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ static int xen_pcibk_publish_pci_dev(struct xen_pcibk_device *pdev, 
		goto out;

	}



	/* Note: The PV protocol uses %02x, don't change it */

	err = xenbus_printf(XBT_NIL, pdev->xdev->nodename, str,

			    "%04x:%02x:%02x.%02x", domain, bus,

			    PCI_SLOT(devfn), PCI_FUNC(devfn));
@@ -229,7 +230,7 @@ static int xen_pcibk_export_device(struct xen_pcibk_device *pdev, 
		err = -EINVAL;

		xenbus_dev_fatal(pdev->xdev, err,

				 "Couldn't locate PCI device "

				 "(%04x:%02x:%02x.%01x)! "

				 "(%04x:%02x:%02x.%d)! "

				 "perhaps already in-use?",

				 domain, bus, slot, func);

		goto out;
@@ -274,7 +275,7 @@ static int xen_pcibk_remove_device(struct xen_pcibk_device *pdev, 
	if (!dev) {

		err = -EINVAL;

		dev_dbg(&pdev->xdev->dev, "Couldn't locate PCI device "

			"(%04x:%02x:%02x.%01x)! not owned by this domain\n",

			"(%04x:%02x:%02x.%d)! not owned by this domain\n",

			domain, bus, slot, func);

		goto out;

	}