tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

staging/greybus: eliminate use of NAME_SIZE for strings

Instead, depend on the size of the destination buffer for easier
refactoring.

Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20210221154258.119503-1-memxor@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Kumar Kartikeya Dwivedi and committed by
Greg Kroah-Hartman 1e37da45 f63a0447

+8 -8
+2 -2
drivers/staging/greybus/audio_module.c
··· 260 260 INIT_LIST_HEAD(&gbmodule->widget_ctl_list); 261 261 INIT_LIST_HEAD(&gbmodule->jack_list); 262 262 gbmodule->dev = dev; 263 - snprintf(gbmodule->name, NAME_SIZE, "%s.%s", dev->driver->name, 263 + snprintf(gbmodule->name, sizeof(gbmodule->name), "%s.%s", dev->driver->name, 264 264 dev_name(dev)); 265 265 greybus_set_drvdata(bundle, gbmodule); 266 266 ··· 342 342 /* inform above layer for uevent */ 343 343 dev_dbg(dev, "Inform set_event:%d to above layer\n", 1); 344 344 /* prepare for the audio manager */ 345 - strscpy(desc.name, gbmodule->name, GB_AUDIO_MANAGER_MODULE_NAME_LEN); 345 + strscpy(desc.name, gbmodule->name, sizeof(desc.name)); 346 346 desc.vid = 2; /* todo */ 347 347 desc.pid = 3; /* todo */ 348 348 desc.intf_id = gbmodule->dev_id;
+6 -6
drivers/staging/greybus/audio_topology.c
··· 200 200 return -EINVAL; 201 201 name = gbaudio_map_controlid(module, data->ctl_id, 202 202 uinfo->value.enumerated.item); 203 - strscpy(uinfo->value.enumerated.name, name, NAME_SIZE); 203 + strscpy(uinfo->value.enumerated.name, name, sizeof(uinfo->value.enumerated.name)); 204 204 break; 205 205 default: 206 206 dev_err(comp->dev, "Invalid type: %d for %s:kcontrol\n", ··· 363 363 platform_min = le32_to_cpu(info->value.integer.min); 364 364 365 365 if (platform_max == 1 && 366 - !strnstr(kcontrol->id.name, " Volume", NAME_SIZE)) 366 + !strnstr(kcontrol->id.name, " Volume", sizeof(kcontrol->id.name))) 367 367 uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; 368 368 else 369 369 uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; ··· 1047 1047 } 1048 1048 1049 1049 /* Prefix dev_id to widget control_name */ 1050 - strscpy(temp_name, w->name, NAME_SIZE); 1051 - snprintf(w->name, NAME_SIZE, "GB %d %s", module->dev_id, temp_name); 1050 + strscpy(temp_name, w->name, sizeof(temp_name)); 1051 + snprintf(w->name, sizeof(w->name), "GB %d %s", module->dev_id, temp_name); 1052 1052 1053 1053 switch (w->type) { 1054 1054 case snd_soc_dapm_spk: ··· 1169 1169 } 1170 1170 control->id = curr->id; 1171 1171 /* Prefix dev_id to widget_name */ 1172 - strscpy(temp_name, curr->name, NAME_SIZE); 1173 - snprintf(curr->name, NAME_SIZE, "GB %d %s", module->dev_id, 1172 + strscpy(temp_name, curr->name, sizeof(temp_name)); 1173 + snprintf(curr->name, sizeof(curr->name), "GB %d %s", module->dev_id, 1174 1174 temp_name); 1175 1175 control->name = curr->name; 1176 1176 if (curr->info.type == GB_AUDIO_CTL_ELEM_TYPE_ENUMERATED) {