Commit 1e37da45 authored by Kumar Kartikeya Dwivedi's avatar Kumar Kartikeya Dwivedi Committed by Greg Kroah-Hartman

staging/greybus: eliminate use of NAME_SIZE for strings

Instead, depend on the size of the destination buffer for easier
refactoring.
Signed-off-by: default avatarKumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20210221154258.119503-1-memxor@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f63a0447
...@@ -260,7 +260,7 @@ static int gb_audio_probe(struct gb_bundle *bundle, ...@@ -260,7 +260,7 @@ static int gb_audio_probe(struct gb_bundle *bundle,
INIT_LIST_HEAD(&gbmodule->widget_ctl_list); INIT_LIST_HEAD(&gbmodule->widget_ctl_list);
INIT_LIST_HEAD(&gbmodule->jack_list); INIT_LIST_HEAD(&gbmodule->jack_list);
gbmodule->dev = dev; gbmodule->dev = dev;
snprintf(gbmodule->name, NAME_SIZE, "%s.%s", dev->driver->name, snprintf(gbmodule->name, sizeof(gbmodule->name), "%s.%s", dev->driver->name,
dev_name(dev)); dev_name(dev));
greybus_set_drvdata(bundle, gbmodule); greybus_set_drvdata(bundle, gbmodule);
...@@ -342,7 +342,7 @@ static int gb_audio_probe(struct gb_bundle *bundle, ...@@ -342,7 +342,7 @@ static int gb_audio_probe(struct gb_bundle *bundle,
/* inform above layer for uevent */ /* inform above layer for uevent */
dev_dbg(dev, "Inform set_event:%d to above layer\n", 1); dev_dbg(dev, "Inform set_event:%d to above layer\n", 1);
/* prepare for the audio manager */ /* prepare for the audio manager */
strscpy(desc.name, gbmodule->name, GB_AUDIO_MANAGER_MODULE_NAME_LEN); strscpy(desc.name, gbmodule->name, sizeof(desc.name));
desc.vid = 2; /* todo */ desc.vid = 2; /* todo */
desc.pid = 3; /* todo */ desc.pid = 3; /* todo */
desc.intf_id = gbmodule->dev_id; desc.intf_id = gbmodule->dev_id;
......
...@@ -200,7 +200,7 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol, ...@@ -200,7 +200,7 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol,
return -EINVAL; return -EINVAL;
name = gbaudio_map_controlid(module, data->ctl_id, name = gbaudio_map_controlid(module, data->ctl_id,
uinfo->value.enumerated.item); uinfo->value.enumerated.item);
strscpy(uinfo->value.enumerated.name, name, NAME_SIZE); strscpy(uinfo->value.enumerated.name, name, sizeof(uinfo->value.enumerated.name));
break; break;
default: default:
dev_err(comp->dev, "Invalid type: %d for %s:kcontrol\n", dev_err(comp->dev, "Invalid type: %d for %s:kcontrol\n",
...@@ -363,7 +363,7 @@ static int gbcodec_mixer_dapm_ctl_info(struct snd_kcontrol *kcontrol, ...@@ -363,7 +363,7 @@ static int gbcodec_mixer_dapm_ctl_info(struct snd_kcontrol *kcontrol,
platform_min = le32_to_cpu(info->value.integer.min); platform_min = le32_to_cpu(info->value.integer.min);
if (platform_max == 1 && if (platform_max == 1 &&
!strnstr(kcontrol->id.name, " Volume", NAME_SIZE)) !strnstr(kcontrol->id.name, " Volume", sizeof(kcontrol->id.name)))
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
else else
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
...@@ -1047,8 +1047,8 @@ static int gbaudio_tplg_create_widget(struct gbaudio_module_info *module, ...@@ -1047,8 +1047,8 @@ static int gbaudio_tplg_create_widget(struct gbaudio_module_info *module,
} }
/* Prefix dev_id to widget control_name */ /* Prefix dev_id to widget control_name */
strscpy(temp_name, w->name, NAME_SIZE); strscpy(temp_name, w->name, sizeof(temp_name));
snprintf(w->name, NAME_SIZE, "GB %d %s", module->dev_id, temp_name); snprintf(w->name, sizeof(w->name), "GB %d %s", module->dev_id, temp_name);
switch (w->type) { switch (w->type) {
case snd_soc_dapm_spk: case snd_soc_dapm_spk:
...@@ -1169,8 +1169,8 @@ static int gbaudio_tplg_process_kcontrols(struct gbaudio_module_info *module, ...@@ -1169,8 +1169,8 @@ static int gbaudio_tplg_process_kcontrols(struct gbaudio_module_info *module,
} }
control->id = curr->id; control->id = curr->id;
/* Prefix dev_id to widget_name */ /* Prefix dev_id to widget_name */
strscpy(temp_name, curr->name, NAME_SIZE); strscpy(temp_name, curr->name, sizeof(temp_name));
snprintf(curr->name, NAME_SIZE, "GB %d %s", module->dev_id, snprintf(curr->name, sizeof(curr->name), "GB %d %s", module->dev_id,
temp_name); temp_name);
control->name = curr->name; control->name = curr->name;
if (curr->info.type == GB_AUDIO_CTL_ELEM_TYPE_ENUMERATED) { if (curr->info.type == GB_AUDIO_CTL_ELEM_TYPE_ENUMERATED) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment