Commit 95548e47 authored by Patrick Mochel's avatar Patrick Mochel

device model: remove flags parameter from struct device_driver::remove and fix all users

parent 64d1cb77
...@@ -98,7 +98,7 @@ static void device_unbind(struct device * dev) ...@@ -98,7 +98,7 @@ static void device_unbind(struct device * dev)
{ {
/* unbind from driver */ /* unbind from driver */
if (dev->driver && dev->driver->remove) 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) static int do_driver_bind(struct device * dev, void * data)
...@@ -126,7 +126,7 @@ static int do_driver_unbind(struct device * dev, void * data) ...@@ -126,7 +126,7 @@ static int do_driver_unbind(struct device * dev, void * data)
dev->driver = NULL; dev->driver = NULL;
unlock_device(dev); unlock_device(dev);
if (drv->remove) if (drv->remove)
drv->remove(dev,REMOVE_NOTIFY); drv->remove(dev);
} else } else
unlock_device(dev); unlock_device(dev);
return 0; return 0;
......
...@@ -113,7 +113,7 @@ void device_shutdown(void) ...@@ -113,7 +113,7 @@ void device_shutdown(void)
put_device(prev); put_device(prev);
if (dev->driver && dev->driver->remove) if (dev->driver && dev->driver->remove)
dev->driver->remove(dev,REMOVE_FREE_RESOURCES); dev->driver->remove(dev);
spin_lock(&device_lock); spin_lock(&device_lock);
prev = dev; prev = dev;
......
...@@ -47,7 +47,7 @@ static int pci_device_probe(struct device * dev) ...@@ -47,7 +47,7 @@ static int pci_device_probe(struct device * dev)
return error > 0 ? 0 : -ENODEV; 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); struct pci_dev * pci_dev = list_entry(dev,struct pci_dev,dev);
......
...@@ -48,11 +48,6 @@ enum { ...@@ -48,11 +48,6 @@ enum {
RESUME_ENABLE, RESUME_ENABLE,
}; };
enum {
REMOVE_NOTIFY,
REMOVE_FREE_RESOURCES,
};
struct device; struct device;
struct device_driver; struct device_driver;
...@@ -103,7 +98,7 @@ struct device_driver { ...@@ -103,7 +98,7 @@ struct device_driver {
struct driver_dir_entry dir; struct driver_dir_entry dir;
int (*probe) (struct device * dev); 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 (*suspend) (struct device * dev, u32 state, u32 level);
int (*resume) (struct device * dev, u32 level); int (*resume) (struct device * dev, u32 level);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment