ALSA: oxfw: rename local functions for control elements so that they represent as...

This commit renames local functions with prefix 'spkr_', so that they're
for firewire-speakers.

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

diff --git a/sound/firewire/oxfw/oxfw-spkr.c b/sound/firewire/oxfw/oxfw-spkr.c
index 22d853665683602bd41a528d6813ab468b0f05c1..fde6b765fe311cce513b3b1d2f9ab28147ac957e 100644 (file)
--- a/sound/firewire/oxfw/oxfw-spkr.c
+++ b/sound/firewire/oxfw/oxfw-spkr.c
@@ -14,7 +14,7 @@ enum control_attribute {
        CTL_CURRENT     = 0x10,
 };
 
-static int oxfw_mute_command(struct snd_oxfw *oxfw, bool *value,
+static int spkr_mute_command(struct snd_oxfw *oxfw, bool *value,
                             enum control_action action)
 {
        u8 *buf;
@@ -70,7 +70,7 @@ error:
        return err;
 }
 
-static int oxfw_volume_command(struct snd_oxfw *oxfw, s16 *value,
+static int spkr_volume_command(struct snd_oxfw *oxfw, s16 *value,
                               unsigned int channel,
                               enum control_attribute attribute,
                               enum control_action action)
@@ -131,7 +131,7 @@ error:
        return err;
 }
 
-static int oxfw_mute_get(struct snd_kcontrol *control,
+static int spkr_mute_get(struct snd_kcontrol *control,
                         struct snd_ctl_elem_value *value)
 {
        struct snd_oxfw *oxfw = control->private_data;
@@ -141,7 +141,7 @@ static int oxfw_mute_get(struct snd_kcontrol *control,
        return 0;
 }
 
-static int oxfw_mute_put(struct snd_kcontrol *control,
+static int spkr_mute_put(struct snd_kcontrol *control,
                         struct snd_ctl_elem_value *value)
 {
        struct snd_oxfw *oxfw = control->private_data;
@@ -153,7 +153,7 @@ static int oxfw_mute_put(struct snd_kcontrol *control,
        if (mute == oxfw->mute)
                return 0;
 
-       err = oxfw_mute_command(oxfw, &mute, CTL_WRITE);
+       err = spkr_mute_command(oxfw, &mute, CTL_WRITE);
        if (err < 0)
                return err;
        oxfw->mute = mute;
@@ -161,7 +161,7 @@ static int oxfw_mute_put(struct snd_kcontrol *control,
        return 1;
 }
 
-static int oxfw_volume_info(struct snd_kcontrol *control,
+static int spkr_volume_info(struct snd_kcontrol *control,
                            struct snd_ctl_elem_info *info)
 {
        struct snd_oxfw *oxfw = control->private_data;
@@ -176,7 +176,7 @@ static int oxfw_volume_info(struct snd_kcontrol *control,
 
 static const u8 channel_map[6] = { 0, 1, 4, 5, 2, 3 };
 
-static int oxfw_volume_get(struct snd_kcontrol *control,
+static int spkr_volume_get(struct snd_kcontrol *control,
                           struct snd_ctl_elem_value *value)
 {
        struct snd_oxfw *oxfw = control->private_data;
@@ -188,7 +188,7 @@ static int oxfw_volume_get(struct snd_kcontrol *control,
        return 0;
 }
 
-static int oxfw_volume_put(struct snd_kcontrol *control,
+static int spkr_volume_put(struct snd_kcontrol *control,
                           struct snd_ctl_elem_value *value)
 {
        struct snd_oxfw *oxfw = control->private_data;
@@ -218,7 +218,7 @@ static int oxfw_volume_put(struct snd_kcontrol *control,
        for (i = 0; i <= oxfw->device_info->mixer_channels; ++i) {
                volume = value->value.integer.value[channel_map[i ? i - 1 : 0]];
                if (changed_channels & (1 << i)) {
-                       err = oxfw_volume_command(oxfw, &volume, i,
+                       err = spkr_volume_command(oxfw, &volume, i,
                                                   CTL_CURRENT, CTL_WRITE);
                        if (err < 0)
                                return err;
@@ -230,44 +230,44 @@ static int oxfw_volume_put(struct snd_kcontrol *control,
        return changed_channels != 0;
 }
 
-int snd_oxfw_create_mixer(struct snd_oxfw *oxfw)
+int snd_oxfw_add_spkr(struct snd_oxfw *oxfw)
 {
        static const struct snd_kcontrol_new controls[] = {
                {
                        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                        .name = "PCM Playback Switch",
                        .info = snd_ctl_boolean_mono_info,
-                       .get = oxfw_mute_get,
-                       .put = oxfw_mute_put,
+                       .get = spkr_mute_get,
+                       .put = spkr_mute_put,
                },
                {
                        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                        .name = "PCM Playback Volume",
-                       .info = oxfw_volume_info,
-                       .get = oxfw_volume_get,
-                       .put = oxfw_volume_put,
+                       .info = spkr_volume_info,
+                       .get = spkr_volume_get,
+                       .put = spkr_volume_put,
                },
        };
        unsigned int i, first_ch;
        int err;
 
-       err = oxfw_volume_command(oxfw, &oxfw->volume_min,
+       err = spkr_volume_command(oxfw, &oxfw->volume_min,
                                   0, CTL_MIN, CTL_READ);
        if (err < 0)
                return err;
-       err = oxfw_volume_command(oxfw, &oxfw->volume_max,
+       err = spkr_volume_command(oxfw, &oxfw->volume_max,
                                   0, CTL_MAX, CTL_READ);
        if (err < 0)
                return err;
 
-       err = oxfw_mute_command(oxfw, &oxfw->mute, CTL_READ);
+       err = spkr_mute_command(oxfw, &oxfw->mute, CTL_READ);
        if (err < 0)
                return err;
 
        first_ch = oxfw->device_info->mixer_channels == 1 ? 0 : 1;
        for (i = 0; i < oxfw->device_info->mixer_channels; ++i) {
-               err = oxfw_volume_command(oxfw, &oxfw->volume[i],
-                                          first_ch + i, CTL_CURRENT, CTL_READ);
+               err = spkr_volume_command(oxfw, &oxfw->volume[i],
+                                         first_ch + i, CTL_CURRENT, CTL_READ);
                if (err < 0)
                        return err;
        }

diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
index 588b93f20c2e23e6955ca76c5d0b5076561b6fd5..0304d4549f44267f868e0eb4509c258245f2cd44 100644 (file)
--- a/sound/firewire/oxfw/oxfw.c
+++ b/sound/firewire/oxfw/oxfw.c
@@ -205,7 +205,7 @@ static int oxfw_probe(struct fw_unit *unit,
                goto error;
 
        if (oxfw->device_info) {
-               err = snd_oxfw_create_mixer(oxfw);
+               err = snd_oxfw_add_spkr(oxfw);
                if (err < 0)
                        goto error;
        }

diff --git a/sound/firewire/oxfw/oxfw.h b/sound/firewire/oxfw/oxfw.h
index 8392c424ad1d53bb91ea04f7dc78f67362b2f543..9efdc026fdad2109d947fd7edfea467d86e72ed5 100644 (file)
--- a/sound/firewire/oxfw/oxfw.h
+++ b/sound/firewire/oxfw/oxfw.h
@@ -138,10 +138,10 @@ void snd_oxfw_stream_lock_release(struct snd_oxfw *oxfw);
 
 int snd_oxfw_create_pcm(struct snd_oxfw *oxfw);
 
-int snd_oxfw_create_mixer(struct snd_oxfw *oxfw);
-
 void snd_oxfw_proc_init(struct snd_oxfw *oxfw);
 
 int snd_oxfw_create_midi(struct snd_oxfw *oxfw);
 
 int snd_oxfw_create_hwdep(struct snd_oxfw *oxfw);
+
+int snd_oxfw_add_spkr(struct snd_oxfw *oxfw);