mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-16 02:14:58 +00:00
cdd30ebb1b
Clean up the existing export namespace code along the same lines of
commit 33def8498fdd ("treewide: Convert macro and uses of __section(foo)
to __section("foo")") and for the same reason, it is not desired for the
namespace argument to be a macro expansion itself.
Scripted using
git grep -l -e MODULE_IMPORT_NS -e EXPORT_SYMBOL_NS | while read file;
do
awk -i inplace '
/^#define EXPORT_SYMBOL_NS/ {
gsub(/__stringify\(ns\)/, "ns");
print;
next;
}
/^#define MODULE_IMPORT_NS/ {
gsub(/__stringify\(ns\)/, "ns");
print;
next;
}
/MODULE_IMPORT_NS/ {
$0 = gensub(/MODULE_IMPORT_NS\(([^)]*)\)/, "MODULE_IMPORT_NS(\"\\1\")", "g");
}
/EXPORT_SYMBOL_NS/ {
if ($0 ~ /(EXPORT_SYMBOL_NS[^(]*)\(([^,]+),/) {
if ($0 !~ /(EXPORT_SYMBOL_NS[^(]*)\(([^,]+), ([^)]+)\)/ &&
$0 !~ /(EXPORT_SYMBOL_NS[^(]*)\(\)/ &&
$0 !~ /^my/) {
getline line;
gsub(/[[:space:]]*\\$/, "");
gsub(/[[:space:]]/, "", line);
$0 = $0 " " line;
}
$0 = gensub(/(EXPORT_SYMBOL_NS[^(]*)\(([^,]+), ([^)]+)\)/,
"\\1(\\2, \"\\3\")", "g");
}
}
{ print }' $file;
done
Requested-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://mail.google.com/mail/u/2/#inbox/FMfcgzQXKWgMmjdFwwdsfgxzKpVHWPlc
Acked-by: Greg KH <gregkh@linuxfoundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
92 lines
2.4 KiB
C
92 lines
2.4 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
// This file incorporates work covered by the following copyright notice:
|
|
// Copyright (c) 2020 Intel Corporation
|
|
// Copyright (c) 2024 Advanced Micro Devices, Inc.
|
|
|
|
/*
|
|
* soc_sdw_rt5682 - Helpers to handle RT5682 from generic machine driver
|
|
*/
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/input.h>
|
|
#include <linux/soundwire/sdw.h>
|
|
#include <linux/soundwire/sdw_type.h>
|
|
#include <sound/control.h>
|
|
#include <sound/soc.h>
|
|
#include <sound/soc-acpi.h>
|
|
#include <sound/soc-dapm.h>
|
|
#include <sound/jack.h>
|
|
#include <sound/soc_sdw_utils.h>
|
|
|
|
static const struct snd_soc_dapm_route rt5682_map[] = {
|
|
/*Headphones*/
|
|
{ "Headphone", NULL, "rt5682 HPOL" },
|
|
{ "Headphone", NULL, "rt5682 HPOR" },
|
|
{ "rt5682 IN1P", NULL, "Headset Mic" },
|
|
};
|
|
|
|
static struct snd_soc_jack_pin rt5682_jack_pins[] = {
|
|
{
|
|
.pin = "Headphone",
|
|
.mask = SND_JACK_HEADPHONE,
|
|
},
|
|
{
|
|
.pin = "Headset Mic",
|
|
.mask = SND_JACK_MICROPHONE,
|
|
},
|
|
};
|
|
|
|
int asoc_sdw_rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
|
|
{
|
|
struct snd_soc_card *card = rtd->card;
|
|
struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
|
|
struct snd_soc_component *component;
|
|
struct snd_soc_jack *jack;
|
|
int ret;
|
|
|
|
component = dai->component;
|
|
card->components = devm_kasprintf(card->dev, GFP_KERNEL,
|
|
"%s hs:rt5682",
|
|
card->components);
|
|
if (!card->components)
|
|
return -ENOMEM;
|
|
|
|
ret = snd_soc_dapm_add_routes(&card->dapm, rt5682_map,
|
|
ARRAY_SIZE(rt5682_map));
|
|
|
|
if (ret) {
|
|
dev_err(card->dev, "rt5682 map addition failed: %d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
ret = snd_soc_card_jack_new_pins(rtd->card, "Headset Jack",
|
|
SND_JACK_HEADSET | SND_JACK_BTN_0 |
|
|
SND_JACK_BTN_1 | SND_JACK_BTN_2 |
|
|
SND_JACK_BTN_3,
|
|
&ctx->sdw_headset,
|
|
rt5682_jack_pins,
|
|
ARRAY_SIZE(rt5682_jack_pins));
|
|
if (ret) {
|
|
dev_err(rtd->card->dev, "Headset Jack creation failed: %d\n",
|
|
ret);
|
|
return ret;
|
|
}
|
|
|
|
jack = &ctx->sdw_headset;
|
|
|
|
snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);
|
|
snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);
|
|
snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
|
|
snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
|
|
|
|
ret = snd_soc_component_set_jack(component, jack, NULL);
|
|
|
|
if (ret)
|
|
dev_err(rtd->card->dev, "Headset Jack call-back failed: %d\n",
|
|
ret);
|
|
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL_NS(asoc_sdw_rt5682_rtd_init, "SND_SOC_SDW_UTILS");
|