Commit bcabcfd2 authored by Stefan Richter's avatar Stefan Richter

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: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 94a87157
...@@ -194,10 +194,7 @@ static int fw_unit_probe(struct device *dev) ...@@ -194,10 +194,7 @@ static int fw_unit_probe(struct device *dev)
struct fw_driver *driver = struct fw_driver *driver =
container_of(dev->driver, 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)); return driver->probe(fw_unit(dev), unit_match(dev, dev->driver));
else
return driver->driver.probe(dev);
} }
static int fw_unit_remove(struct device *dev) static int fw_unit_remove(struct device *dev)
...@@ -205,10 +202,7 @@ static int fw_unit_remove(struct device *dev) ...@@ -205,10 +202,7 @@ static int fw_unit_remove(struct device *dev)
struct fw_driver *driver = struct fw_driver *driver =
container_of(dev->driver, struct fw_driver, driver); container_of(dev->driver, struct fw_driver, driver);
if (driver->remove)
return driver->remove(fw_unit(dev)), 0; return driver->remove(fw_unit(dev)), 0;
else
return driver->driver.remove(dev);
} }
static int get_modalias(struct fw_unit *unit, char *buffer, size_t buffer_size) static int get_modalias(struct fw_unit *unit, char *buffer, size_t buffer_size)
......
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