firewire: introduce fw_driver.probe and .remove methods

FireWire upper layer drivers are converted from generic
    struct driver.probe() and .remove()
to bus-specific
    struct fw_driver.probe() and .remove().

The new .probe() adds a const struct ieee1394_device_id *id argument,
indicating the entry in the driver's device identifiers table which
matched the fw_unit to be probed.  This new argument is used by the
snd-firewire-speakers driver to look up device-specific parameters and
methods.  There is at least one other FireWire audio driver currently in
development in which this will be useful too.

The new .remove() drops the unused error return code.

Although all in-tree drivers are being converted to the new methods,
support for the old methods is left in place in this commit.  This
allows public developer trees to merge this commit and then move to the
new fw_driver methods.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Acked-by: Clemens Ladisch <clemens@ladisch.de> (for sound/firewire/)
Cc: Peter Hurley <peter@hurleysoftware.com> (for drivers/staging/fwserial/)

1 files changed, 9 insertions, 10 deletions

diff --git a/drivers/media/firewire/firedtv-fw.c b/drivers/media/firewire/firedtv-fw.c
index e24ec539a5fd..247f0e7cb5f7 100644
--- a/drivers/media/firewire/firedtv-fw.c
+++ b/drivers/media/firewire/firedtv-fw.c
@@ -248,7 +248,7 @@ static const char * const model_names[] = {
 /* Adjust the template string if models with longer names appear. */
 #define MAX_MODEL_NAME_LEN sizeof("FireDTV ????")
 
-static int node_probe(struct device *dev)
+static int node_probe(struct fw_unit *unit, const struct ieee1394_device_id *id)
 {
         struct firedtv *fdtv;
         char name[MAX_MODEL_NAME_LEN];
@@ -258,8 +258,8 @@ static int node_probe(struct device *dev)
         if (!fdtv)
                 return -ENOMEM;
 
-        dev_set_drvdata(dev, fdtv);
-        fdtv->device            = dev;
+        dev_set_drvdata(&unit->device, fdtv);
+        fdtv->device            = &unit->device;
         fdtv->isochannel        = -1;
         fdtv->voltage           = 0xff;
         fdtv->tone              = 0xff;
@@ -269,7 +269,7 @@ static int node_probe(struct device *dev)
         mutex_init(&fdtv->demux_mutex);
         INIT_WORK(&fdtv->remote_ctrl_work, avc_remote_ctrl_work);
 
-        name_len = fw_csr_string(fw_unit(dev)->directory, CSR_MODEL,
+        name_len = fw_csr_string(unit->directory, CSR_MODEL,
                                  name, sizeof(name));
         for (i = ARRAY_SIZE(model_names); --i; )
                 if (strlen(model_names[i]) <= name_len &&
@@ -277,7 +277,7 @@ static int node_probe(struct device *dev)
                         break;
         fdtv->type = i;
 
-        err = fdtv_register_rc(fdtv, dev);
+        err = fdtv_register_rc(fdtv, &unit->device);
         if (err)
                 goto fail_free;
 
@@ -307,9 +307,9 @@ fail_free:
         return err;
 }
 
-static int node_remove(struct device *dev)
+static void node_remove(struct fw_unit *unit)
 {
-        struct firedtv *fdtv = dev_get_drvdata(dev);
+        struct firedtv *fdtv = dev_get_drvdata(&unit->device);
 
         fdtv_dvb_unregister(fdtv);
 
@@ -320,7 +320,6 @@ static int node_remove(struct device *dev)
         fdtv_unregister_rc(fdtv);
 
         kfree(fdtv);
-        return 0;
 }
 
 static void node_update(struct fw_unit *unit)
@@ -391,10 +390,10 @@ static struct fw_driver fdtv_driver = {
                 .owner  = THIS_MODULE,
                 .name   = "firedtv",
                 .bus    = &fw_bus_type,
-                .probe  = node_probe,
-                .remove = node_remove,
         },
+        .probe    = node_probe,
         .update   = node_update,
+        .remove   = node_remove,
         .id_table = fdtv_id_table,
 };