Commit 75b1a8f9 authored by Joe Perches's avatar Joe Perches Committed by Takashi Iwai
Browse files

ALSA: Convert strlcpy to strscpy when return value is unused 

strlcpy is deprecated.  see: Documentation/process/deprecated.rst

Change the calls that do not use the strlcpy return value to the
preferred strscpy.

Done with cocci script:

@@
expression e1, e2, e3;
@@

-	strlcpy(
+	strscpy(
	e1, e2, e3);

This cocci script leaves the instances where the return value is
used unchanged.

After this patch, sound/ has 3 uses of strlcpy() that need to be
manually inspected for conversion and changed one day.

$ git grep -w strlcpy sound/
sound/usb/card.c:               len = strlcpy(card->longname, s, sizeof(card->longname));
sound/usb/mixer.c:      return strlcpy(buf, p->name, buflen);
sound/usb/mixer.c:                      return strlcpy(buf, p->names[index], buflen);

Miscellenea:

o Remove trailing whitespace in conversion of sound/core/hwdep.c

Link: https://lore.kernel.org/lkml/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/22b393d1790bb268769d0bab7bacf0866dcb0c14.camel@perches.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6dcb8bf9

sound/aoa/codecs/onyx.c

+1 −1
Original line number Diff line number Diff line
@@ -1013,7 +1013,7 @@ static int onyx_i2c_probe(struct i2c_client *client, 
		goto fail;

	}



	strlcpy(onyx->codec.name, "onyx", MAX_CODEC_NAME_LEN);

	strscpy(onyx->codec.name, "onyx", MAX_CODEC_NAME_LEN);

	onyx->codec.owner = THIS_MODULE;

	onyx->codec.init = onyx_init_codec;

	onyx->codec.exit = onyx_exit_codec;

sound/aoa/codecs/tas.c

+1 −1
Original line number Diff line number Diff line
@@ -894,7 +894,7 @@ static int tas_i2c_probe(struct i2c_client *client, 
	/* seems that half is a saner default */

	tas->drc_range = TAS3004_DRC_MAX / 2;



	strlcpy(tas->codec.name, "tas", MAX_CODEC_NAME_LEN);

	strscpy(tas->codec.name, "tas", MAX_CODEC_NAME_LEN);

	tas->codec.owner = THIS_MODULE;

	tas->codec.init = tas_init_codec;

	tas->codec.exit = tas_exit_codec;

sound/aoa/codecs/toonie.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static int __init toonie_init(void) 
	if (!toonie)

		return -ENOMEM;



	strlcpy(toonie->codec.name, "toonie", sizeof(toonie->codec.name));

	strscpy(toonie->codec.name, "toonie", sizeof(toonie->codec.name));

	toonie->codec.owner = THIS_MODULE;

	toonie->codec.init = toonie_init_codec;

	toonie->codec.exit = toonie_exit_codec;

sound/aoa/core/alsa.c

+4 −4
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ int aoa_alsa_init(char *name, struct module *mod, struct device *dev) 
		return err;

	aoa_card = alsa_card->private_data;

	aoa_card->alsa_card = alsa_card;

	strlcpy(alsa_card->driver, "AppleOnbdAudio", sizeof(alsa_card->driver));

	strlcpy(alsa_card->shortname, name, sizeof(alsa_card->shortname));

	strlcpy(alsa_card->longname, name, sizeof(alsa_card->longname));

	strlcpy(alsa_card->mixername, name, sizeof(alsa_card->mixername));

	strscpy(alsa_card->driver, "AppleOnbdAudio", sizeof(alsa_card->driver));

	strscpy(alsa_card->shortname, name, sizeof(alsa_card->shortname));

	strscpy(alsa_card->longname, name, sizeof(alsa_card->longname));

	strscpy(alsa_card->mixername, name, sizeof(alsa_card->mixername));

	err = snd_card_register(aoa_card->alsa_card);

	if (err < 0) {

		printk(KERN_ERR "snd-aoa: couldn't register alsa card\n");

sound/aoa/fabrics/layout.c

+3 −3
Original line number Diff line number Diff line
@@ -948,7 +948,7 @@ static void layout_attached_codec(struct aoa_codec *codec) 
				ldev->gpio.methods->set_lineout(codec->gpio, 1);

			ctl = snd_ctl_new1(&lineout_ctl, codec->gpio);

			if (cc->connected & CC_LINEOUT_LABELLED_HEADPHONE)

				strlcpy(ctl->id.name,

				strscpy(ctl->id.name,

					"Headphone Switch", sizeof(ctl->id.name));

			ldev->lineout_ctrl = ctl;

			aoa_snd_ctl_add(ctl);
@@ -962,14 +962,14 @@ static void layout_attached_codec(struct aoa_codec *codec) 
				ctl = snd_ctl_new1(&lineout_detect_choice,

						   ldev);

				if (cc->connected & CC_LINEOUT_LABELLED_HEADPHONE)

					strlcpy(ctl->id.name,

					strscpy(ctl->id.name,

						"Headphone Detect Autoswitch",

						sizeof(ctl->id.name));

				aoa_snd_ctl_add(ctl);

				ctl = snd_ctl_new1(&lineout_detected,

						   ldev);

				if (cc->connected & CC_LINEOUT_LABELLED_HEADPHONE)

					strlcpy(ctl->id.name,

					strscpy(ctl->id.name,

						"Headphone Detected",

						sizeof(ctl->id.name));

				ldev->lineout_detected_ctrl = ctl;