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/)

3 files changed, 82 insertions, 107 deletions

diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
index d428ffede4f3..58a5afefdc69 100644
--- a/sound/firewire/isight.c
+++ b/sound/firewire/isight.c
@@ -626,9 +626,9 @@ static u64 get_unit_base(struct fw_unit *unit)
         return 0;
 }
 
-static int isight_probe(struct device *unit_dev)
+static int isight_probe(struct fw_unit *unit,
+                        const struct ieee1394_device_id *id)
 {
-        struct fw_unit *unit = fw_unit(unit_dev);
         struct fw_device *fw_dev = fw_parent_device(unit);
         struct snd_card *card;
         struct isight *isight;
@@ -637,7 +637,7 @@ static int isight_probe(struct device *unit_dev)
         err = snd_card_create(-1, NULL, THIS_MODULE, sizeof(*isight), &card);
         if (err < 0)
                 return err;
-        snd_card_set_dev(card, unit_dev);
+        snd_card_set_dev(card, &unit->device);
 
         isight = card->private_data;
         isight->card = card;
@@ -674,7 +674,7 @@ static int isight_probe(struct device *unit_dev)
         if (err < 0)
                 goto error;
 
-        dev_set_drvdata(unit_dev, isight);
+        dev_set_drvdata(&unit->device, isight);
 
         return 0;
 
@@ -686,23 +686,6 @@ error:
         return err;
 }
 
-static int isight_remove(struct device *dev)
-{
-        struct isight *isight = dev_get_drvdata(dev);
-
-        isight_pcm_abort(isight);
-
-        snd_card_disconnect(isight->card);
-
-        mutex_lock(&isight->mutex);
-        isight_stop_streaming(isight);
-        mutex_unlock(&isight->mutex);
-
-        snd_card_free_when_closed(isight->card);
-
-        return 0;
-}
-
 static void isight_bus_reset(struct fw_unit *unit)
 {
         struct isight *isight = dev_get_drvdata(&unit->device);
@@ -716,6 +699,21 @@ static void isight_bus_reset(struct fw_unit *unit)
         }
 }
 
+static void isight_remove(struct fw_unit *unit)
+{
+        struct isight *isight = dev_get_drvdata(&unit->device);
+
+        isight_pcm_abort(isight);
+
+        snd_card_disconnect(isight->card);
+
+        mutex_lock(&isight->mutex);
+        isight_stop_streaming(isight);
+        mutex_unlock(&isight->mutex);
+
+        snd_card_free_when_closed(isight->card);
+}
+
 static const struct ieee1394_device_id isight_id_table[] = {
         {
                 .match_flags  = IEEE1394_MATCH_SPECIFIER_ID |
@@ -732,10 +730,10 @@ static struct fw_driver isight_driver = {
                 .owner  = THIS_MODULE,
                 .name   = KBUILD_MODNAME,
                 .bus    = &fw_bus_type,
-                .probe  = isight_probe,
-                .remove = isight_remove,
         },
+        .probe    = isight_probe,
         .update   = isight_bus_reset,
+        .remove   = isight_remove,
         .id_table = isight_id_table,
 };
 
diff --git a/sound/firewire/scs1x.c b/sound/firewire/scs1x.c
index 844a555c3b1e..1f5920d6eacc 100644
--- a/sound/firewire/scs1x.c
+++ b/sound/firewire/scs1x.c
@@ -384,9 +384,8 @@ static void scs_card_free(struct snd_card *card)
         kfree(scs->buffer);
 }
 
-static int scs_probe(struct device *unit_dev)
+static int scs_probe(struct fw_unit *unit, const struct ieee1394_device_id *id)
 {
-        struct fw_unit *unit = fw_unit(unit_dev);
         struct fw_device *fw_dev = fw_parent_device(unit);
         struct snd_card *card;
         struct scs *scs;
@@ -395,7 +394,7 @@ static int scs_probe(struct device *unit_dev)
         err = snd_card_create(-16, NULL, THIS_MODULE, sizeof(*scs), &card);
         if (err < 0)
                 return err;
-        snd_card_set_dev(card, unit_dev);
+        snd_card_set_dev(card, &unit->device);
 
         scs = card->private_data;
         scs->card = card;
@@ -440,7 +439,7 @@ static int scs_probe(struct device *unit_dev)
         if (err < 0)
                 goto err_card;
 
-        dev_set_drvdata(unit_dev, scs);
+        dev_set_drvdata(&unit->device, scs);
 
         return 0;
 
@@ -451,9 +450,20 @@ err_card:
         return err;
 }
 
-static int scs_remove(struct device *dev)
+static void scs_update(struct fw_unit *unit)
 {
-        struct scs *scs = dev_get_drvdata(dev);
+        struct scs *scs = dev_get_drvdata(&unit->device);
+        __be64 data;
+
+        data = cpu_to_be64(((u64)HSS1394_TAG_CHANGE_ADDRESS << 56) |
+                           scs->hss_handler.offset);
+        snd_fw_transaction(scs->unit, TCODE_WRITE_BLOCK_REQUEST,
+                           HSS1394_ADDRESS, &data, 8);
+}
+
+static void scs_remove(struct fw_unit *unit)
+{
+        struct scs *scs = dev_get_drvdata(&unit->device);
 
         snd_card_disconnect(scs->card);
 
@@ -465,19 +475,6 @@ static int scs_remove(struct device *dev)
         tasklet_kill(&scs->tasklet);
 
         snd_card_free_when_closed(scs->card);
-
-        return 0;
-}
-
-static void scs_update(struct fw_unit *unit)
-{
-        struct scs *scs = dev_get_drvdata(&unit->device);
-        __be64 data;
-
-        data = cpu_to_be64(((u64)HSS1394_TAG_CHANGE_ADDRESS << 56) |
-                           scs->hss_handler.offset);
-        snd_fw_transaction(scs->unit, TCODE_WRITE_BLOCK_REQUEST,
-                           HSS1394_ADDRESS, &data, 8);
 }
 
 static const struct ieee1394_device_id scs_id_table[] = {
@@ -506,10 +503,10 @@ static struct fw_driver scs_driver = {
                 .owner  = THIS_MODULE,
                 .name   = KBUILD_MODNAME,
                 .bus    = &fw_bus_type,
-                .probe  = scs_probe,
-                .remove = scs_remove,
         },
+        .probe    = scs_probe,
         .update   = scs_update,
+        .remove   = scs_remove,
         .id_table = scs_id_table,
 };
 
diff --git a/sound/firewire/speakers.c b/sound/firewire/speakers.c
index d6846557f270..2c6386503940 100644
--- a/sound/firewire/speakers.c
+++ b/sound/firewire/speakers.c
@@ -663,45 +663,9 @@ static void fwspk_card_free(struct snd_card *card)
         mutex_destroy(&fwspk->mutex);
 }
 
-static const struct device_info *fwspk_detect(struct fw_device *dev)
+static int fwspk_probe(struct fw_unit *unit,
+                       const struct ieee1394_device_id *id)
 {
-        static const struct device_info griffin_firewave = {
-                .driver_name = "FireWave",
-                .short_name  = "FireWave",
-                .long_name   = "Griffin FireWave Surround",
-                .pcm_constraints = firewave_constraints,
-                .mixer_channels = 6,
-                .mute_fb_id   = 0x01,
-                .volume_fb_id = 0x02,
-        };
-        static const struct device_info lacie_speakers = {
-                .driver_name = "FWSpeakers",
-                .short_name  = "FireWire Speakers",
-                .long_name   = "LaCie FireWire Speakers",
-                .pcm_constraints = lacie_speakers_constraints,
-                .mixer_channels = 1,
-                .mute_fb_id   = 0x01,
-                .volume_fb_id = 0x01,
-        };
-        struct fw_csr_iterator i;
-        int key, value;
-
-        fw_csr_iterator_init(&i, dev->config_rom);
-        while (fw_csr_iterator_next(&i, &key, &value))
-                if (key == CSR_VENDOR)
-                        switch (value) {
-                        case VENDOR_GRIFFIN:
-                                return &griffin_firewave;
-                        case VENDOR_LACIE:
-                                return &lacie_speakers;
-                        }
-
-        return NULL;
-}
-
-static int fwspk_probe(struct device *unit_dev)
-{
-        struct fw_unit *unit = fw_unit(unit_dev);
         struct fw_device *fw_dev = fw_parent_device(unit);
         struct snd_card *card;
         struct fwspk *fwspk;
@@ -711,17 +675,13 @@ static int fwspk_probe(struct device *unit_dev)
         err = snd_card_create(-1, NULL, THIS_MODULE, sizeof(*fwspk), &card);
         if (err < 0)
                 return err;
-        snd_card_set_dev(card, unit_dev);
+        snd_card_set_dev(card, &unit->device);
 
         fwspk = card->private_data;
         fwspk->card = card;
         mutex_init(&fwspk->mutex);
         fwspk->unit = fw_unit_get(unit);
-        fwspk->device_info = fwspk_detect(fw_dev);
-        if (!fwspk->device_info) {
-                err = -ENODEV;
-                goto err_unit;
-        }
+        fwspk->device_info = (const struct device_info *)id->driver_data;
 
         err = cmp_connection_init(&fwspk->connection, unit, 0);
         if (err < 0)
@@ -756,7 +716,7 @@ static int fwspk_probe(struct device *unit_dev)
         if (err < 0)
                 goto error;
 
-        dev_set_drvdata(unit_dev, fwspk);
+        dev_set_drvdata(&unit->device, fwspk);
 
         return 0;
 
@@ -770,22 +730,6 @@ error:
         return err;
 }
 
-static int fwspk_remove(struct device *dev)
-{
-        struct fwspk *fwspk = dev_get_drvdata(dev);
-
-        amdtp_out_stream_pcm_abort(&fwspk->stream);
-        snd_card_disconnect(fwspk->card);
-
-        mutex_lock(&fwspk->mutex);
-        fwspk_stop_stream(fwspk);
-        mutex_unlock(&fwspk->mutex);
-
-        snd_card_free_when_closed(fwspk->card);
-
-        return 0;
-}
-
 static void fwspk_bus_reset(struct fw_unit *unit)
 {
         struct fwspk *fwspk = dev_get_drvdata(&unit->device);
@@ -803,6 +747,40 @@ static void fwspk_bus_reset(struct fw_unit *unit)
         amdtp_out_stream_update(&fwspk->stream);
 }
 
+static void fwspk_remove(struct fw_unit *unit)
+{
+        struct fwspk *fwspk = dev_get_drvdata(&unit->device);
+
+        amdtp_out_stream_pcm_abort(&fwspk->stream);
+        snd_card_disconnect(fwspk->card);
+
+        mutex_lock(&fwspk->mutex);
+        fwspk_stop_stream(fwspk);
+        mutex_unlock(&fwspk->mutex);
+
+        snd_card_free_when_closed(fwspk->card);
+}
+
+static const struct device_info griffin_firewave = {
+        .driver_name = "FireWave",
+        .short_name  = "FireWave",
+        .long_name   = "Griffin FireWave Surround",
+        .pcm_constraints = firewave_constraints,
+        .mixer_channels = 6,
+        .mute_fb_id   = 0x01,
+        .volume_fb_id = 0x02,
+};
+
+static const struct device_info lacie_speakers = {
+        .driver_name = "FWSpeakers",
+        .short_name  = "FireWire Speakers",
+        .long_name   = "LaCie FireWire Speakers",
+        .pcm_constraints = lacie_speakers_constraints,
+        .mixer_channels = 1,
+        .mute_fb_id   = 0x01,
+        .volume_fb_id = 0x01,
+};
+
 static const struct ieee1394_device_id fwspk_id_table[] = {
         {
                 .match_flags  = IEEE1394_MATCH_VENDOR_ID |
@@ -813,6 +791,7 @@ static const struct ieee1394_device_id fwspk_id_table[] = {
                 .model_id     = 0x00f970,
                 .specifier_id = SPECIFIER_1394TA,
                 .version      = VERSION_AVC,
+                .driver_data  = (kernel_ulong_t)&griffin_firewave,
         },
         {
                 .match_flags  = IEEE1394_MATCH_VENDOR_ID |
@@ -823,6 +802,7 @@ static const struct ieee1394_device_id fwspk_id_table[] = {
                 .model_id     = 0x00f970,
                 .specifier_id = SPECIFIER_1394TA,
                 .version      = VERSION_AVC,
+                .driver_data  = (kernel_ulong_t)&lacie_speakers,
         },
         { }
 };
@@ -833,10 +813,10 @@ static struct fw_driver fwspk_driver = {
                 .owner  = THIS_MODULE,
                 .name   = KBUILD_MODNAME,
                 .bus    = &fw_bus_type,
-                .probe  = fwspk_probe,
-                .remove = fwspk_remove,
         },
+        .probe    = fwspk_probe,
         .update   = fwspk_bus_reset,
+        .remove   = fwspk_remove,
         .id_table = fwspk_id_table,
 };