ALSA: oxfw: use managed-resource to maintain model-specific data

ALSA oxfw driver allocates memory objects for data specific to some
models. These objects are used to maintain functionalities specific
to the models for ALSA rawMIDI/control interfaces. They can be
released as managed-resource of 'struct snd_card.card_dev'.

This commit uses managed-resource of the sound card device for this
purpose.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/oxfw/oxfw-scs1x.c b/sound/firewire/oxfw/oxfw-scs1x.c
index f33497c..9d95458 100644 (file)
--- a/sound/firewire/oxfw/oxfw-scs1x.c
+++ b/sound/firewire/oxfw/oxfw-scs1x.c
@@ -372,8 +372,9 @@ int snd_oxfw_scs1x_add(struct snd_oxfw *oxfw)
        struct fw_scs1x *scs;
        int err;
 
-       scs = kzalloc(sizeof(struct fw_scs1x), GFP_KERNEL);
-       if (scs == NULL)
+       scs = devm_kzalloc(&oxfw->card->card_dev, sizeof(struct fw_scs1x),
+                          GFP_KERNEL);
+       if (!scs)
                return -ENOMEM;
        scs->fw_dev = fw_parent_device(oxfw->unit);
        oxfw->spec = scs;

diff --git a/sound/firewire/oxfw/oxfw-spkr.c b/sound/firewire/oxfw/oxfw-spkr.c
index cb905af..66d4b1f 100644 (file)
--- a/sound/firewire/oxfw/oxfw-spkr.c
+++ b/sound/firewire/oxfw/oxfw-spkr.c
@@ -270,8 +270,9 @@ int snd_oxfw_add_spkr(struct snd_oxfw *oxfw, bool is_lacie)
        unsigned int i, first_ch;
        int err;
 
-       spkr = kzalloc(sizeof(struct fw_spkr), GFP_KERNEL);
-       if (spkr == NULL)
+       spkr = devm_kzalloc(&oxfw->card->card_dev, sizeof(struct fw_spkr),
+                           GFP_KERNEL);
+       if (!spkr)
                return -ENOMEM;
        oxfw->spec = spkr;
 

diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index b892a86..06d791a 100644 (file)
--- a/sound/firewire/oxfw/oxfw.c
+++ b/sound/firewire/oxfw/oxfw.c
@@ -126,7 +126,6 @@ static void oxfw_free(struct snd_oxfw *oxfw)
                kfree(oxfw->rx_stream_formats[i]);
        }
 
-       kfree(oxfw->spec);
        mutex_destroy(&oxfw->mutex);
        fw_unit_put(oxfw->unit);
 }
@@ -276,8 +275,6 @@ error:
                oxfw->rx_stream_formats[i] = NULL;
        }
        snd_card_free(oxfw->card);
-       kfree(oxfw->spec);
-       oxfw->spec = NULL;
        dev_info(&oxfw->unit->device,
                 "Sound card registration failed: %d\n", err);
 }