From: Arnd Bergmann <arnd@arndb.de>
To: Arnaud Pouliquen <arnaud.pouliquen@st.com>
Cc: Mark Brown <broonie@kernel.org>,
Jonathan Cameron <jic23@kernel.org>,
Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
linux-iio@vger.kernel.org,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] IIO: ADC: stm32-dfsdm: remove unused variable
Date: Wed, 17 Jan 2018 21:09:19 +0100 [thread overview]
Message-ID: <CAK8P3a2_g+cPjZgv=_c=VunV+eCVPkFn7mYSxqKD_LqNdrLUBw@mail.gmail.com> (raw)
In-Reply-To: <8dd30c35-011c-1d0f-7331-76df8fcd0c23@st.com>
On Wed, Jan 17, 2018 at 4:27 PM, Arnaud Pouliquen
<arnaud.pouliquen@st.com> wrote:
> Hi Arnd,
>
> On 01/17/2018 03:46 PM, Arnd Bergmann wrote:
>> A cleanup left one variable behind that is no longer needed and
>> can be removed, as shown by the gcc warning:
>>
>> drivers/iio/adc/stm32-dfsdm-core.c: In function 'stm32_dfsdm_probe':
>> drivers/iio/adc/stm32-dfsdm-core.c:245:29: error: unused variable 'of_id' [-Werror=unused-variable]
>>
>> Fixes: abaca806fd13 ("IIO: ADC: stm32-dfsdm: code optimization")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>> drivers/iio/adc/stm32-dfsdm-core.c | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/drivers/iio/adc/stm32-dfsdm-core.c b/drivers/iio/adc/stm32-dfsdm-core.c
>> index 84277bcc465f..6290332cfd3f 100644
>> --- a/drivers/iio/adc/stm32-dfsdm-core.c
>> +++ b/drivers/iio/adc/stm32-dfsdm-core.c
>> @@ -242,7 +242,6 @@ MODULE_DEVICE_TABLE(of, stm32_dfsdm_of_match);
>> static int stm32_dfsdm_probe(struct platform_device *pdev)
>> {
>> struct dfsdm_priv *priv;
>> - const struct of_device_id *of_id;
>> const struct stm32_dfsdm_dev_data *dev_data;
>> struct stm32_dfsdm *dfsdm;
>> int ret;
>>
> Could you crosscheck? This is included in the patch:
> https://www.spinics.net/lists/arm-kernel/msg628841.html applied in
> Mark's branches ( commit abaca806fd13afd069e04e883de8ec75924b0598)
The problem appears to have come from a mismerge in commit d84b4c7c706f
("Merge branch 'topic/iio' of
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound
into asoc-st-dfsdm"). abaca806fd13 was fine, but when Mark merged it into
his branch, it seems there was a conflict because both sides contained
a copy of my earlier patch 2353758bc2d4 ("IIO: ADC: stm32-dfsdm: avoid
unused-variable warning") and 25140717414c, plus one had your
abaca806fd1 patch on top.
So my patch is correct, but my the 'Fixes' line in the description is wrong,
it should have an explanation about the mismerge.
Mark, not sure how you want to proceed from here: if this is a branch
that can get rebased, it might be best to do that merge again, or even
drop one of the two copies of my earlier patch. Otherwise I can send
a new version of the fix with an updated explanation.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] IIO: ADC: stm32-dfsdm: remove unused variable
Date: Wed, 17 Jan 2018 21:09:19 +0100 [thread overview]
Message-ID: <CAK8P3a2_g+cPjZgv=_c=VunV+eCVPkFn7mYSxqKD_LqNdrLUBw@mail.gmail.com> (raw)
In-Reply-To: <8dd30c35-011c-1d0f-7331-76df8fcd0c23@st.com>
On Wed, Jan 17, 2018 at 4:27 PM, Arnaud Pouliquen
<arnaud.pouliquen@st.com> wrote:
> Hi Arnd,
>
> On 01/17/2018 03:46 PM, Arnd Bergmann wrote:
>> A cleanup left one variable behind that is no longer needed and
>> can be removed, as shown by the gcc warning:
>>
>> drivers/iio/adc/stm32-dfsdm-core.c: In function 'stm32_dfsdm_probe':
>> drivers/iio/adc/stm32-dfsdm-core.c:245:29: error: unused variable 'of_id' [-Werror=unused-variable]
>>
>> Fixes: abaca806fd13 ("IIO: ADC: stm32-dfsdm: code optimization")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>> drivers/iio/adc/stm32-dfsdm-core.c | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/drivers/iio/adc/stm32-dfsdm-core.c b/drivers/iio/adc/stm32-dfsdm-core.c
>> index 84277bcc465f..6290332cfd3f 100644
>> --- a/drivers/iio/adc/stm32-dfsdm-core.c
>> +++ b/drivers/iio/adc/stm32-dfsdm-core.c
>> @@ -242,7 +242,6 @@ MODULE_DEVICE_TABLE(of, stm32_dfsdm_of_match);
>> static int stm32_dfsdm_probe(struct platform_device *pdev)
>> {
>> struct dfsdm_priv *priv;
>> - const struct of_device_id *of_id;
>> const struct stm32_dfsdm_dev_data *dev_data;
>> struct stm32_dfsdm *dfsdm;
>> int ret;
>>
> Could you crosscheck? This is included in the patch:
> https://www.spinics.net/lists/arm-kernel/msg628841.html applied in
> Mark's branches ( commit abaca806fd13afd069e04e883de8ec75924b0598)
The problem appears to have come from a mismerge in commit d84b4c7c706f
("Merge branch 'topic/iio' of
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound
into asoc-st-dfsdm"). abaca806fd13 was fine, but when Mark merged it into
his branch, it seems there was a conflict because both sides contained
a copy of my earlier patch 2353758bc2d4 ("IIO: ADC: stm32-dfsdm: avoid
unused-variable warning") and 25140717414c, plus one had your
abaca806fd1 patch on top.
So my patch is correct, but my the 'Fixes' line in the description is wrong,
it should have an explanation about the mismerge.
Mark, not sure how you want to proceed from here: if this is a branch
that can get rebased, it might be best to do that merge again, or even
drop one of the two copies of my earlier patch. Otherwise I can send
a new version of the fix with an updated explanation.
Arnd
next prev parent reply other threads:[~2018-01-17 20:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-17 14:46 [PATCH] IIO: ADC: stm32-dfsdm: remove unused variable Arnd Bergmann
2018-01-17 14:46 ` Arnd Bergmann
2018-01-17 15:27 ` Robin Murphy
2018-01-17 15:27 ` Robin Murphy
2018-01-17 15:27 ` Arnaud Pouliquen
2018-01-17 15:27 ` Arnaud Pouliquen
2018-01-17 20:09 ` Arnd Bergmann [this message]
2018-01-17 20:09 ` Arnd Bergmann
2018-01-18 10:39 ` Mark Brown
2018-01-18 10:39 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAK8P3a2_g+cPjZgv=_c=VunV+eCVPkFn7mYSxqKD_LqNdrLUBw@mail.gmail.com' \
--to=arnd@arndb.de \
--cc=alexandre.torgue@st.com \
--cc=arnaud.pouliquen@st.com \
--cc=broonie@kernel.org \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcoquelin.stm32@gmail.com \
--cc=pmeerw@pmeerw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.