Skip to content

Commit

Permalink
ALSA: oxfw: rename local functions for control elements so that they …
Browse files Browse the repository at this point in the history 
…represent as local

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>
  • Loading branch information
Takashi Sakamoto authored and Takashi Iwai committed Dec 15, 2015
1 parent f3a0e32 commit 29aa09a
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
40 changes: 20 additions & 20 deletions sound/firewire/oxfw/oxfw-spkr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -70,7 +70,7 @@ static int oxfw_mute_command(struct snd_oxfw *oxfw, bool *value,
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)
Expand Down Expand Up @@ -131,7 +131,7 @@ static int oxfw_volume_command(struct snd_oxfw *oxfw, s16 *value,
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;
Expand All @@ -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;
Expand All @@ -153,15 +153,15 @@ 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;

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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion sound/firewire/oxfw/oxfw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions sound/firewire/oxfw/oxfw.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

0 comments on commit 29aa09a

Please sign in to comment.