diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2013-06-09 18:15:00 +0200 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2013-06-09 18:15:00 +0200 |
| commit | bcabcfd2e09ceb8599a33001e812e7cbad00fc4d (patch) | |
| tree | a6e5f41fa0cb7bc72e2da01a2c2a58aeb66d46a1 /drivers | |
| parent | 94a87157cde95d38b9cdf1116e4f0fd93f6d25df (diff) | |
firewire: remove support of fw_driver.driver.probe and .remove methods
After all IEEE 1394 high-level drivers being converted to bus-specific
.probe/.remove methods, remove support of the obsolete generic methods.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firewire/core-device.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c index c152edd6cd3..de4aa409abe 100644 --- a/drivers/firewire/core-device.c +++ b/drivers/firewire/core-device.c @@ -194,10 +194,7 @@ static int fw_unit_probe(struct device *dev) struct fw_driver *driver = container_of(dev->driver, struct fw_driver, driver); - if (driver->probe) - return driver->probe(fw_unit(dev), unit_match(dev, dev->driver)); - else - return driver->driver.probe(dev); + return driver->probe(fw_unit(dev), unit_match(dev, dev->driver)); } static int fw_unit_remove(struct device *dev) @@ -205,10 +202,7 @@ static int fw_unit_remove(struct device *dev) struct fw_driver *driver = container_of(dev->driver, struct fw_driver, driver); - if (driver->remove) - return driver->remove(fw_unit(dev)), 0; - else - return driver->driver.remove(dev); + return driver->remove(fw_unit(dev)), 0; } static int get_modalias(struct fw_unit *unit, char *buffer, size_t buffer_size) |