[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <9ef6c39c-e7a2-4591-380f-07f92317313b@metafoo.de>
Date: Sat, 19 Nov 2016 16:48:26 +0100
From: Lars-Peter Clausen <lars@...afoo.de>
To: Krzysztof Kozlowski <krzk@...nel.org>,
Sangbeom Kim <sbkim73@...sung.com>,
Sylwester Nawrocki <s.nawrocki@...sung.com>,
Liam Girdwood <lgirdwood@...il.com>,
Mark Brown <broonie@...nel.org>,
Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
alsa-devel@...a-project.org
Subject: Re: [PATCH 2/6] ASoC: samsung: smdk_wm8580: Remove old platforms and
drop mach-types usage
On 11/19/2016 04:45 PM, Lars-Peter Clausen wrote:
> On 11/19/2016 04:42 PM, Lars-Peter Clausen wrote:
>> On 11/19/2016 03:48 PM, Krzysztof Kozlowski wrote:
>> [...]
>>> @@ -206,15 +204,10 @@ static int __init smdk_audio_init(void)
>>> int ret;
>>> char *str;
>>>
>>> - if (machine_is_smdkc100()
>>> - || machine_is_smdkv210() || machine_is_smdkc110()) {
>>> - smdk.num_links = 3;
>>> - } else if (machine_is_smdk6410()) {
>>> - str = (char *)smdk_dai[PRI_PLAYBACK].cpu_dai_name;
>>> - str[strlen(str) - 1] = '2';
>>> - str = (char *)smdk_dai[PRI_CAPTURE].cpu_dai_name;
>>> - str[strlen(str) - 1] = '2';
>>> - }
>>> + str = (char *)smdk_dai[PRI_PLAYBACK].cpu_dai_name;
>>> + str[strlen(str) - 1] = '2';
>>> + str = (char *)smdk_dai[PRI_CAPTURE].cpu_dai_name;
>>> + str[strlen(str) - 1] = '2';
>>
>> This could be further simplified by just updating the initial cpu_dai_name
>> string in the dai_link struct.
>>
>> Especially considering that the cpu_dai_name is a string literal and the ARM
>> kernel now has rodata write protection enabled by default, so modifying it
>> will crash the kernel.
>
> Spoke too soon, you fix this up in the next patch. But I'd just squash that
> change into this patch. I think it is pretty safe to assume that it is correct.
>
And another thing. Since num_links is always 2 now the last entry from the
smdk_dai array can be removed and num_links can be initialized using
ARRAY_SIZE().
Powered by blists - more mailing lists