firewire: remove support of fw_driver.driver.probe and .remove methods

[karo-tx-linux.git] / drivers / firewire / core-device.c

diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
index c152edd6cd3a6bbbce952deab531d5230e95cd88..de4aa409abe2988d8dc5b421e969ab5256fb4009 100644 (file)
--- 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)