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: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
parent
87d2e2ecf6
commit
0516c8bcd2
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue