lkml.org 
[lkml]   [2013]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] firewire: remove support of fw_driver.driver.probe and .remove methods
After all 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>
---
To be merged maybe one release cycle after patch "firewire: introduce
fw_driver.probe and .remove methods".

drivers/firewire/core-device.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)

--- a/drivers/firewire/core-device.c
+++ b/drivers/firewire/core-device.c
@@ -197,10 +197,7 @@ static int fw_unit_probe(struct device *
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)
@@ -208,10 +205,9 @@ static int fw_unit_remove(struct device
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);
+ driver->remove(fw_unit(dev));
+
+ return 0;
}

static int get_modalias(struct fw_unit *unit, char *buffer, size_t buffer_size)

--
Stefan Richter
-=====-===-= -==- ---==
http://arcgraph.de/sr/

\
 
 \ /
  Last update: 2013-06-03 01:21    [W:0.068 / U:1.452 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site