AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

PCI: PCIe portdrv: Simplily probe callback of service drivers

Browse Source 
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:
Rafael J. Wysocki 2009-01-13 14:44:19 +01:00 committed by Jesse Barnes
parent 87d2e2ecf6
commit 0516c8bcd2
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/pci/hotplug/pciehp_acpi.c
View File

@ -82,8 +82,7 @@ static int __initdata acpi_slot_detected;
static struct list_head __initdata dummy_slots = LIST_HEAD_INIT(dummy_slots); static struct list_head __initdata dummy_slots = LIST_HEAD_INIT(dummy_slots);
/* Dummy driver for dumplicate name detection */ /* Dummy driver for dumplicate name detection */
static int __init dummy_probe(struct pcie_device *dev, static int __init dummy_probe(struct pcie_device *dev)
const struct pcie_port_service_id *id)
{ {
int pos; int pos;
u32 slot_cap; u32 slot_cap;

2
drivers/pci/hotplug/pciehp_core.c
View File

@ -401,7 +401,7 @@ static int get_cur_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe
return 0; 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; int rc;
struct controller *ctrl; struct controller *ctrl;

6
drivers/pci/pcie/aer/aerdrv.c
View File

@ -38,8 +38,7 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC); MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static int __devinit aer_probe (struct pcie_device *dev, static int __devinit aer_probe (struct pcie_device *dev);
const struct pcie_port_service_id *id );
static void aer_remove(struct pcie_device *dev); static void aer_remove(struct pcie_device *dev);
static int aer_suspend(struct pcie_device *dev, pm_message_t state) static int aer_suspend(struct pcie_device *dev, pm_message_t state)
{return 0;} {return 0;}
@ -207,8 +206,7 @@ static void aer_remove(struct pcie_device *dev)
* *
* Invoked when PCI Express bus loads AER service driver. * Invoked when PCI Express bus loads AER service driver.
**/ **/
static int __devinit aer_probe (struct pcie_device *dev, static int __devinit aer_probe (struct pcie_device *dev)
const struct pcie_port_service_id *id )
{ {
int status; int status;
struct aer_rpc *rpc; struct aer_rpc *rpc;

2
drivers/pci/pcie/portdrv_core.c
View File

@ -402,7 +402,7 @@ static int pcie_port_probe_service(struct device *dev)
return -ENODEV; return -ENODEV;
pciedev = to_pcie_device(dev); pciedev = to_pcie_device(dev);
status = driver->probe(pciedev, driver->id_table); status = driver->probe(pciedev);
if (!status) { if (!status) {
dev_printk(KERN_DEBUG, dev, "service driver %s loaded\n", dev_printk(KERN_DEBUG, dev, "service driver %s loaded\n",
driver->name); driver->name);

3
include/linux/pcieport_if.h
View File

@ -56,8 +56,7 @@ static inline void* get_service_data(struct pcie_device *dev)
struct pcie_port_service_driver { struct pcie_port_service_driver {
const char *name; const char *name;
int (*probe) (struct pcie_device *dev, int (*probe) (struct pcie_device *dev);
const struct pcie_port_service_id *id);
void (*remove) (struct pcie_device *dev); void (*remove) (struct pcie_device *dev);
int (*suspend) (struct pcie_device *dev, pm_message_t state); int (*suspend) (struct pcie_device *dev, pm_message_t state);
int (*resume) (struct pcie_device *dev); int (*resume) (struct pcie_device *dev);