diff options
| author | Patrick Mochel <mochel@osdl.org> | 2002-05-29 23:10:44 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2002-05-29 23:10:44 -0700 |
| commit | 95548e472ccad257232b4cf4fdfd47777ab5dd33 (patch) | |
| tree | e548551f14b139d8a1d80283616ca88a5c91a5d0 | |
| parent | 64d1cb77639c233714ce611c978242272dee3f33 (diff) | |
device model: remove flags parameter from struct device_driver::remove and fix all users
| -rw-r--r-- | drivers/base/core.c | 4 | ||||
| -rw-r--r-- | drivers/base/power.c | 2 | ||||
| -rw-r--r-- | drivers/pci/pci-driver.c | 2 | ||||
| -rw-r--r-- | include/linux/device.h | 7 |
4 files changed, 5 insertions, 10 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 5f41eb4f2ef2..69f5667f5de8 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -98,7 +98,7 @@ static void device_unbind(struct device * dev) { /* unbind from driver */ if (dev->driver && dev->driver->remove) - dev->driver->remove(dev,REMOVE_NOTIFY); + dev->driver->remove(dev); } static int do_driver_bind(struct device * dev, void * data) @@ -126,7 +126,7 @@ static int do_driver_unbind(struct device * dev, void * data) dev->driver = NULL; unlock_device(dev); if (drv->remove) - drv->remove(dev,REMOVE_NOTIFY); + drv->remove(dev); } else unlock_device(dev); return 0; diff --git a/drivers/base/power.c b/drivers/base/power.c index c2fa3b71a16e..f916cb838b30 100644 --- a/drivers/base/power.c +++ b/drivers/base/power.c @@ -113,7 +113,7 @@ void device_shutdown(void) put_device(prev); if (dev->driver && dev->driver->remove) - dev->driver->remove(dev,REMOVE_FREE_RESOURCES); + dev->driver->remove(dev); spin_lock(&device_lock); prev = dev; diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 56c8c84d533a..0109b2fad2c6 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -47,7 +47,7 @@ static int pci_device_probe(struct device * dev) return error > 0 ? 0 : -ENODEV; } -static int pci_device_remove(struct device * dev, u32 flags) +static int pci_device_remove(struct device * dev) { struct pci_dev * pci_dev = list_entry(dev,struct pci_dev,dev); diff --git a/include/linux/device.h b/include/linux/device.h index dd88f8b7cace..2186f85a8beb 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -48,11 +48,6 @@ enum { RESUME_ENABLE, }; -enum { - REMOVE_NOTIFY, - REMOVE_FREE_RESOURCES, -}; - struct device; struct device_driver; @@ -103,7 +98,7 @@ struct device_driver { struct driver_dir_entry dir; int (*probe) (struct device * dev); - int (*remove) (struct device * dev, u32 flags); + int (*remove) (struct device * dev); int (*suspend) (struct device * dev, u32 state, u32 level); int (*resume) (struct device * dev, u32 level); |