[prev in list] [next in list] [prev in thread] [next in thread]
List: linux1394-devel
Subject: [PATCH] firewire: remove support of fw_driver.driver.probe and .remove methods
From: Stefan Richter <stefanr () s5r6 ! in-berlin ! de>
Date: 2013-06-02 22:32:49
Message-ID: 20130603003249.5287b4c4 () stein
[Download RAW message or body]
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/
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2
_______________________________________________
mailing list linux1394-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux1394-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic