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

Commit 0516c8bc authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Jesse Barnes
Browse files

PCI: PCIe portdrv: Simplily probe callback of service drivers 



The second argument of the ->probe() callback in
struct pcie_port_service_driver is unnecessary and never used.
Remove it.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 87d2e2ec

drivers/pci/hotplug/pciehp_acpi.c

+1 −2
Original line number Diff line number Diff line
@@ -82,8 +82,7 @@ static int __initdata acpi_slot_detected; 
static struct list_head __initdata dummy_slots = LIST_HEAD_INIT(dummy_slots);



/* Dummy driver for dumplicate name detection */

static int __init dummy_probe(struct pcie_device *dev,

			      const struct pcie_port_service_id *id)

static int __init dummy_probe(struct pcie_device *dev)

{

	int pos;

	u32 slot_cap;

drivers/pci/hotplug/pciehp_core.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe 
	return 0;

}



static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_id *id)

static int pciehp_probe(struct pcie_device *dev)

{

	int rc;

	struct controller *ctrl;

drivers/pci/pcie/aer/aerdrv.c

+2 −4
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ MODULE_AUTHOR(DRIVER_AUTHOR); 
MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_LICENSE("GPL");



static int __devinit aer_probe (struct pcie_device *dev,

	const struct pcie_port_service_id *id );

static int __devinit aer_probe (struct pcie_device *dev);

static void aer_remove(struct pcie_device *dev);

static int aer_suspend(struct pcie_device *dev, pm_message_t state)

{return 0;}
@@ -207,8 +206,7 @@ static void aer_remove(struct pcie_device *dev) 
 *

 * Invoked when PCI Express bus loads AER service driver.

 **/

static int __devinit aer_probe (struct pcie_device *dev,

				const struct pcie_port_service_id *id )

static int __devinit aer_probe (struct pcie_device *dev)

{

	int status;

	struct aer_rpc *rpc;

drivers/pci/pcie/portdrv_core.c

+1 −1
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ static int pcie_port_probe_service(struct device *dev) 
		return -ENODEV;



	pciedev = to_pcie_device(dev);

	status = driver->probe(pciedev, driver->id_table);

	status = driver->probe(pciedev);

	if (!status) {

		dev_printk(KERN_DEBUG, dev, "service driver %s loaded\n",

			driver->name);

include/linux/pcieport_if.h

+1 −2
Original line number Diff line number Diff line
@@ -56,8 +56,7 @@ static inline void* get_service_data(struct pcie_device *dev) 


struct pcie_port_service_driver {

	const char *name;

	int (*probe) (struct pcie_device *dev, 

		const struct pcie_port_service_id *id);

	int (*probe) (struct pcie_device *dev);

	void (*remove) (struct pcie_device *dev);

	int (*suspend) (struct pcie_device *dev, pm_message_t state);

	int (*resume) (struct pcie_device *dev);