mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 21:21:41 +00:00
75b1a8f9d6
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: Joe Perches <joe@perches.com> Acked-by: Mark Brown <broonie@kernel.org> Link: https://lore.kernel.org/r/22b393d1790bb268769d0bab7bacf0866dcb0c14.camel@perches.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
85 lines
2.0 KiB
C
85 lines
2.0 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* Helper functions for jack-detection kcontrols
|
|
*
|
|
* Copyright (c) 2011 Takashi Iwai <tiwai@suse.de>
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/export.h>
|
|
#include <sound/core.h>
|
|
#include <sound/control.h>
|
|
|
|
#define jack_detect_kctl_info snd_ctl_boolean_mono_info
|
|
|
|
static int jack_detect_kctl_get(struct snd_kcontrol *kcontrol,
|
|
struct snd_ctl_elem_value *ucontrol)
|
|
{
|
|
ucontrol->value.integer.value[0] = kcontrol->private_value;
|
|
return 0;
|
|
}
|
|
|
|
static const struct snd_kcontrol_new jack_detect_kctl = {
|
|
/* name is filled later */
|
|
.iface = SNDRV_CTL_ELEM_IFACE_CARD,
|
|
.access = SNDRV_CTL_ELEM_ACCESS_READ,
|
|
.info = jack_detect_kctl_info,
|
|
.get = jack_detect_kctl_get,
|
|
};
|
|
|
|
static int get_available_index(struct snd_card *card, const char *name)
|
|
{
|
|
struct snd_ctl_elem_id sid;
|
|
|
|
memset(&sid, 0, sizeof(sid));
|
|
|
|
sid.index = 0;
|
|
sid.iface = SNDRV_CTL_ELEM_IFACE_CARD;
|
|
strscpy(sid.name, name, sizeof(sid.name));
|
|
|
|
while (snd_ctl_find_id(card, &sid)) {
|
|
sid.index++;
|
|
/* reset numid; otherwise snd_ctl_find_id() hits this again */
|
|
sid.numid = 0;
|
|
}
|
|
|
|
return sid.index;
|
|
}
|
|
|
|
static void jack_kctl_name_gen(char *name, const char *src_name, int size)
|
|
{
|
|
size_t count = strlen(src_name);
|
|
bool need_cat = true;
|
|
|
|
/* remove redundant " Jack" from src_name */
|
|
if (count >= 5)
|
|
need_cat = strncmp(&src_name[count - 5], " Jack", 5) ? true : false;
|
|
|
|
snprintf(name, size, need_cat ? "%s Jack" : "%s", src_name);
|
|
|
|
}
|
|
|
|
struct snd_kcontrol *
|
|
snd_kctl_jack_new(const char *name, struct snd_card *card)
|
|
{
|
|
struct snd_kcontrol *kctl;
|
|
|
|
kctl = snd_ctl_new1(&jack_detect_kctl, NULL);
|
|
if (!kctl)
|
|
return NULL;
|
|
|
|
jack_kctl_name_gen(kctl->id.name, name, sizeof(kctl->id.name));
|
|
kctl->id.index = get_available_index(card, kctl->id.name);
|
|
kctl->private_value = 0;
|
|
return kctl;
|
|
}
|
|
|
|
void snd_kctl_jack_report(struct snd_card *card,
|
|
struct snd_kcontrol *kctl, bool status)
|
|
{
|
|
if (kctl->private_value == status)
|
|
return;
|
|
kctl->private_value = status;
|
|
snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &kctl->id);
|
|
}
|