Skip to content

Commit

Permalink
firewire: remove support of fw_driver.driver.probe and .remove methods
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stefan Richter committed Jun 9, 2013
1 parent 94a8715 commit bcabcfd
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions drivers/firewire/core-device.c
Expand Up @@ -194,21 +194,15 @@ 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)
{
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)
Expand Down

0 comments on commit bcabcfd

Please sign in to comment.