From: Lee Jones <lee.jones@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Rui Feng <rui_feng@realsil.com.cn>,
Daniel Bristot de Oliveira <bristot@redhat.com>,
Perry Yuan <perry_yuan@dell.com>
Subject: Re: linux-next: build failure after merge of the mfd tree
Date: Mon, 4 Dec 2017 09:39:53 +0000 [thread overview]
Message-ID: <20171204093953.iwhew4w7wgzm6b3q@dell> (raw)
In-Reply-To: <20171204141956.5b90bc18@canb.auug.org.au>
On Mon, 04 Dec 2017, Stephen Rothwell wrote:
> Hi Lee,
>
> After merging the mfd tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/staging/rts5208/sd.o: In function `.sd_power_off_card3v3':
> (.text+0x5760): multiple definition of `.sd_power_off_card3v3'
> drivers/misc/cardreader/rtsx_pcr.o:(.text+0x4630): first defined here
> drivers/staging/rts5208/sd.o:(.opd+0x378): multiple definition of `sd_power_off_card3v3'
> drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x4f8): first defined here
> drivers/staging/rts5208/ms.o: In function `.ms_power_off_card3v3':
> (.text+0x5e70): multiple definition of `.ms_power_off_card3v3'
> drivers/misc/cardreader/rtsx_pcr.o:(.text+0x46e0): first defined here
> drivers/staging/rts5208/ms.o:(.opd+0x360): multiple definition of `ms_power_off_card3v3'
> drivers/misc/cardreader/rtsx_pcr.o:(.opd+0x510): first defined here
>
>
> Caused by commit
>
> 5da4e04ae480 ("misc: rtsx: Add support for RTS5260")
>
> I added the following fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 4 Dec 2017 14:10:34 +1100
> Subject: [PATCH] misc: rtsx: fix symbol clashes
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Thanks Stephen.
Although I'm not sure how to apply this manually without scissors.
Might have to do so manually.
> ---
> drivers/misc/cardreader/rts5260.c | 4 ++--
> drivers/misc/cardreader/rtsx_pcr.c | 4 ++--
> drivers/misc/cardreader/rtsx_pcr.h | 4 ++--
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c
> index 3b308640282d..07cb93abf685 100644
> --- a/drivers/misc/cardreader/rts5260.c
> +++ b/drivers/misc/cardreader/rts5260.c
> @@ -426,9 +426,9 @@ void rts5260_process_ocp(struct rtsx_pcr *pcr)
> rtsx_pci_get_ocpstat(pcr, &pcr->ocp_stat);
> rts5260_get_ocpstat2(pcr, &pcr->ocp_stat2);
> if (pcr->card_exist & SD_EXIST)
> - sd_power_off_card3v3(pcr);
> + rtsx_sd_power_off_card3v3(pcr);
> else if (pcr->card_exist & MS_EXIST)
> - ms_power_off_card3v3(pcr);
> + rtsx_ms_power_off_card3v3(pcr);
>
> if (!(pcr->card_exist & MS_EXIST) && !(pcr->card_exist & SD_EXIST)) {
> if ((pcr->ocp_stat & (SD_OC_NOW | SD_OC_EVER |
> diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c
> index 99adc67bbf73..5345170fc57b 100644
> --- a/drivers/misc/cardreader/rtsx_pcr.c
> +++ b/drivers/misc/cardreader/rtsx_pcr.c
> @@ -1208,7 +1208,7 @@ void rtsx_pci_clear_ocpstat(struct rtsx_pcr *pcr)
> }
> }
>
> -int sd_power_off_card3v3(struct rtsx_pcr *pcr)
> +int rtsx_sd_power_off_card3v3(struct rtsx_pcr *pcr)
> {
> rtsx_pci_write_register(pcr, CARD_CLK_EN, SD_CLK_EN |
> MS_CLK_EN | SD40_CLK_EN, 0);
> @@ -1223,7 +1223,7 @@ int sd_power_off_card3v3(struct rtsx_pcr *pcr)
> return 0;
> }
>
> -int ms_power_off_card3v3(struct rtsx_pcr *pcr)
> +int rtsx_ms_power_off_card3v3(struct rtsx_pcr *pcr)
> {
> rtsx_pci_write_register(pcr, CARD_CLK_EN, SD_CLK_EN |
> MS_CLK_EN | SD40_CLK_EN, 0);
> diff --git a/drivers/misc/cardreader/rtsx_pcr.h b/drivers/misc/cardreader/rtsx_pcr.h
> index c544e35d0154..6ea1655db0bb 100644
> --- a/drivers/misc/cardreader/rtsx_pcr.h
> +++ b/drivers/misc/cardreader/rtsx_pcr.h
> @@ -107,7 +107,7 @@ void rtsx_pci_disable_ocp(struct rtsx_pcr *pcr);
> void rtsx_pci_enable_ocp(struct rtsx_pcr *pcr);
> int rtsx_pci_get_ocpstat(struct rtsx_pcr *pcr, u8 *val);
> void rtsx_pci_clear_ocpstat(struct rtsx_pcr *pcr);
> -int sd_power_off_card3v3(struct rtsx_pcr *pcr);
> -int ms_power_off_card3v3(struct rtsx_pcr *pcr);
> +int rtsx_sd_power_off_card3v3(struct rtsx_pcr *pcr);
> +int rtsx_ms_power_off_card3v3(struct rtsx_pcr *pcr);
>
> #endif
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
next prev parent reply other threads:[~2017-12-04 9:39 UTC|newest]
Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-04 3:19 linux-next: build failure after merge of the mfd tree Stephen Rothwell
2017-12-04 9:10 ` Greg KH
2017-12-04 9:39 ` Lee Jones [this message]
2017-12-05 23:32 ` Stephen Rothwell
2017-12-06 8:58 ` Lee Jones
2017-12-12 2:13 ` Stephen Rothwell
2017-12-12 8:13 ` Lee Jones
2017-12-12 11:54 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-04-06 2:00 Stephen Rothwell
2023-04-06 7:36 ` Lee Jones
2023-04-06 17:22 ` Mark Brown
2023-03-31 1:15 Stephen Rothwell
2022-07-05 1:54 Stephen Rothwell
2022-07-05 12:32 ` Lee Jones
2022-07-05 14:26 ` Aidan MacDonald
2022-02-23 16:54 broonie
2022-02-23 17:03 ` Lee Jones
2022-02-28 6:08 ` Stephen Rothwell
2022-02-28 8:17 ` Lee Jones
[not found] <20201105014728.GC17266@qmqm.qmqm.pl>
2020-11-05 1:50 ` Stephen Rothwell
2020-11-05 1:57 ` Michał Mirosław
2020-11-05 9:09 ` Lee Jones
2020-07-17 3:41 Stephen Rothwell
2020-07-17 6:56 ` Lee Jones
2020-07-17 6:59 ` Stephen Rothwell
2020-07-17 7:11 ` Lee Jones
2020-02-04 3:03 Stephen Rothwell
2020-02-04 7:53 ` Lee Jones
2020-02-04 10:04 ` Srinivas Kandagatla
2019-04-03 0:40 Stephen Rothwell
2018-12-17 5:38 Stephen Rothwell
2017-05-31 2:23 Stephen Rothwell
2017-05-31 3:36 ` Stephen Rothwell
2017-06-05 3:28 ` Stephen Rothwell
2017-04-04 6:44 Stephen Rothwell
2017-04-04 8:19 ` Lee Jones
2017-04-04 8:21 ` Lee Jones
2017-04-04 12:31 ` Andy Shevchenko
2017-04-10 2:11 ` Stephen Rothwell
2017-04-10 6:55 ` Lee Jones
2017-04-10 7:53 ` Stephen Rothwell
2016-02-29 3:51 Stephen Rothwell
2016-03-01 1:19 ` Kuninori Morimoto
2016-03-01 1:35 ` Kuninori Morimoto
2016-03-02 4:00 ` Mark Brown
2015-10-15 2:26 Stephen Rothwell
2015-10-15 3:35 ` kbuild test robot
2015-10-15 8:59 ` Arnd Bergmann
2015-10-15 9:17 ` Lee Jones
2015-10-15 9:45 ` Andy Shevchenko
2015-10-15 12:04 ` Christoph Hellwig
2015-10-15 12:28 ` Arnd Bergmann
2015-10-16 1:27 ` Stephen Rothwell
2015-10-16 10:10 ` Arnd Bergmann
2015-03-04 0:34 Stephen Rothwell
2015-03-04 0:37 ` Stephen Rothwell
2015-03-04 7:26 ` Sascha Hauer
2014-11-11 2:32 Stephen Rothwell
2014-11-04 5:40 Stephen Rothwell
2014-11-04 7:54 ` Krzysztof Kozlowski
2014-11-04 8:09 ` Lee Jones
2014-08-22 16:56 Stephen Rothwell
2014-08-22 19:09 ` Lee Jones
2013-04-08 4:21 Stephen Rothwell
2013-04-08 4:45 ` Alexander Shiyan
2013-04-08 9:22 ` Samuel Ortiz
2013-04-08 16:27 ` Re[2]: " Alexander Shiyan
2013-04-09 7:20 ` Samuel Ortiz
2013-04-09 15:47 ` Re[2]: " Alexander Shiyan
2013-04-09 16:12 ` Samuel Ortiz
2013-04-09 16:50 ` Rob Herring
2013-04-09 20:51 ` Samuel Ortiz
2012-09-25 3:47 Stephen Rothwell
2012-09-25 6:47 ` Matthias Kaehlcke
2012-09-25 8:43 ` Samuel Ortiz
2012-07-09 3:57 Stephen Rothwell
2012-07-09 10:52 ` Samuel Ortiz
2012-07-10 9:20 ` Samuel Ortiz
2012-05-21 3:42 Stephen Rothwell
2012-05-21 8:08 ` Lee Jones
2012-05-21 8:40 ` Stephen Rothwell
2012-05-21 9:01 ` Lee Jones
2012-05-21 9:10 ` Stephen Rothwell
2012-05-21 9:19 ` Lee Jones
2012-05-21 9:54 ` Mark Brown
2012-05-21 10:28 ` Lee Jones
2012-05-22 22:42 ` Samuel Ortiz
2012-05-22 22:52 ` Stephen Rothwell
2012-05-23 14:34 ` Samuel Ortiz
2012-05-21 8:30 ` Lee Jones
2012-05-21 9:07 ` Stephen Rothwell
2012-05-16 6:09 Stephen Rothwell
2012-05-18 8:39 ` Samuel Ortiz
2012-05-14 3:37 Stephen Rothwell
2012-05-14 20:22 ` Samuel Ortiz
2012-03-19 2:13 Stephen Rothwell
2012-03-19 6:19 ` Laxman Dewangan
2012-03-20 12:40 ` Samuel Ortiz
2012-02-21 1:31 Stephen Rothwell
2012-02-21 11:32 ` Samuel Ortiz
2011-12-20 3:17 Stephen Rothwell
2011-12-20 17:37 ` Samuel Ortiz
2011-09-19 6:19 Stephen Rothwell
2011-09-19 9:43 ` Samuel Ortiz
2011-09-16 3:55 Stephen Rothwell
2011-09-16 7:16 ` Uwe Kleine-König
2011-09-16 8:39 ` Stephen Rothwell
2011-09-18 17:15 ` Samuel Ortiz
2011-06-21 3:03 Stephen Rothwell
2011-06-21 10:07 ` Mark Brown
2011-06-21 17:58 ` Samuel Ortiz
2011-02-22 3:20 Stephen Rothwell
2011-02-22 9:21 ` Samuel Ortiz
2010-09-16 2:54 Stephen Rothwell
2010-09-19 22:27 ` Samuel Ortiz
2010-08-09 1:40 Stephen Rothwell
2010-08-09 8:51 ` Mike Rapoport
2010-08-09 9:10 ` Samuel Ortiz
2010-05-19 4:03 Stephen Rothwell
2010-05-19 4:23 ` Rabin VINCENT
2010-05-19 9:57 ` Samuel Ortiz
2010-05-19 14:14 ` Stephen Rothwell
2010-04-08 2:57 Stephen Rothwell
2010-04-08 9:33 ` Samuel Ortiz
2010-04-07 5:02 Stephen Rothwell
2010-04-07 8:53 ` Samuel Ortiz
2010-04-07 16:24 ` Stephen Rothwell
2010-04-07 4:51 Stephen Rothwell
2010-04-07 8:52 ` Samuel Ortiz
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=20171204093953.iwhew4w7wgzm6b3q@dell \
--to=lee.jones@linaro.org \
--cc=bristot@redhat.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=perry_yuan@dell.com \
--cc=rui_feng@realsil.com.cn \
--cc=sfr@canb.auug.org.au \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).