Commit d03c426f authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/driver' 

- Drop the struct pci_dev.driver pointer, which is redundant with the
  struct device.driver pointer (Uwe Kleine-König)

* pci/driver:
  PCI: Remove struct pci_dev->driver
  PCI: Use to_pci_driver() instead of pci_dev->driver
  x86/pci/probe_roms: Use to_pci_driver() instead of pci_dev->driver
  perf/x86/intel/uncore: Use to_pci_driver() instead of pci_dev->driver
  powerpc/eeh: Use to_pci_driver() instead of pci_dev->driver
  usb: xhci: Use to_pci_driver() instead of pci_dev->driver
  cxl: Use to_pci_driver() instead of pci_dev->driver
  cxl: Factor out common dev->driver expressions
  xen/pcifront: Use to_pci_driver() instead of pci_dev->driver
  xen/pcifront: Drop pcifront_common_process() tests of pcidev, pdrv
  nfp: use dev_driver_string() instead of pci_dev->driver->name
  mlxsw: pci: Use dev_driver_string() instead of pci_dev->driver->name
  net: marvell: prestera: use dev_driver_string() instead of pci_dev->driver->name
  net: hns3: use dev_driver_string() instead of pci_dev->driver->name
  crypto: hisilicon - use dev_driver_string() instead of pci_dev->driver->name
  powerpc/eeh: Use dev_driver_string() instead of struct pci_dev->driver->name
  ssb: Use dev_driver_string() instead of pci_dev->driver->name
  bcma: simplify reference to driver name
  crypto: qat - simplify adf_enable_aer()
  scsi: message: fusion: Remove unused mpt_pci driver .probe() 'id' parameter
  PCI/ERR: Factor out common dev->driver expressions
  PCI: Drop pci_device_probe() test of !pci_dev->driver
  PCI: Drop pci_device_remove() test of pci_dev->driver
  PCI: Return NULL for to_pci_driver(NULL)
parents 1cac57a2 b5f9c644

arch/powerpc/include/asm/ppc-pci.h

+0 −5
Original line number Diff line number Diff line
@@ -55,11 +55,6 @@ void eeh_pe_dev_mode_mark(struct eeh_pe *pe, int mode); 
void eeh_sysfs_add_device(struct pci_dev *pdev);

void eeh_sysfs_remove_device(struct pci_dev *pdev);



static inline const char *eeh_driver_name(struct pci_dev *pdev)

{

	return (pdev && pdev->driver) ? pdev->driver->name : "<null>";

}



#endif /* CONFIG_EEH */



#define PCI_BUSNO(bdfn) ((bdfn >> 8) & 0xff)

arch/powerpc/kernel/eeh.c

+8 −0
Original line number Diff line number Diff line
@@ -399,6 +399,14 @@ static int eeh_phb_check_failure(struct eeh_pe *pe) 
	return ret;

}



static inline const char *eeh_driver_name(struct pci_dev *pdev)

{

	if (pdev)

		return dev_driver_string(&pdev->dev);



	return "<null>";

}



/**

 * eeh_dev_check_failure - Check if all 1's data is due to EEH slot freeze

 * @edev: eeh device

arch/powerpc/kernel/eeh_driver.c

+5 −5
Original line number Diff line number Diff line
@@ -104,13 +104,13 @@ static bool eeh_edev_actionable(struct eeh_dev *edev) 
 */

static inline struct pci_driver *eeh_pcid_get(struct pci_dev *pdev)

{

	if (!pdev || !pdev->driver)

	if (!pdev || !pdev->dev.driver)

		return NULL;



	if (!try_module_get(pdev->driver->driver.owner))

	if (!try_module_get(pdev->dev.driver->owner))

		return NULL;



	return pdev->driver;

	return to_pci_driver(pdev->dev.driver);

}



/**
@@ -122,10 +122,10 @@ static inline struct pci_driver *eeh_pcid_get(struct pci_dev *pdev) 
 */

static inline void eeh_pcid_put(struct pci_dev *pdev)

{

	if (!pdev || !pdev->driver)

	if (!pdev || !pdev->dev.driver)

		return;



	module_put(pdev->driver->driver.owner);

	module_put(pdev->dev.driver->owner);

}



/**

arch/x86/events/intel/uncore.c

+1 −1
Original line number Diff line number Diff line
@@ -1187,7 +1187,7 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id 
	 * PCI slot and func to indicate the uncore box.

	 */

	if (id->driver_data & ~0xffff) {

		struct pci_driver *pci_drv = pdev->driver;

		struct pci_driver *pci_drv = to_pci_driver(pdev->dev.driver);



		pmu = uncore_pci_find_dev_pmu(pdev, pci_drv->id_table);

		if (pmu == NULL)

arch/x86/kernel/probe_roms.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static struct resource video_rom_resource = { 
 */

static bool match_id(struct pci_dev *pdev, unsigned short vendor, unsigned short device)

{

	struct pci_driver *drv = pdev->driver;

	struct pci_driver *drv = to_pci_driver(pdev->dev.driver);

	const struct pci_device_id *id;



	if (pdev->vendor == vendor && pdev->device == device)