From patchwork Mon Dec 25 09:09:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 852791 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YNvYhaTQ"; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3z4tcC2tsQz9s4q; Mon, 25 Dec 2017 20:10:03 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1eTOlj-0000Hw-ES; Mon, 25 Dec 2017 09:09:59 +0000 Received: from mail-pf0-f193.google.com ([209.85.192.193]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1eTOlO-0000Es-T9 for kernel-team@lists.ubuntu.com; Mon, 25 Dec 2017 09:09:39 +0000 Received: by mail-pf0-f193.google.com with SMTP id l24so17732800pfj.6 for ; Mon, 25 Dec 2017 01:09:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=FkvNTnGzML/l3MPIukvMNKVroQHqJvVMTste4GPwbFM=; b=YNvYhaTQjh7YHtnT0UOny2LPH4T1oeth6tivmcF57X8dosagGm3jxspsvw5Y/3HuMN RRAAvrCyiG52TyjaFl+FKDtjuuX1VcIQ0Rh0FChZ2IiQUm/plpEJK82ODUZowzsujMdd NFbn319Jlv40+oqGVis2Vy+t+UlslfnP8raFU1MkfAZYP3oSJz3r3+zsvo5DwoV5aAgR FMs2m+5GEWv4bYoVcLuZiFmKAx6G082sHFYcf/8XX8Hcj4YEKwKh09dWLQpPf7kywY3y YRPG7zK4AT0qtVLXXz9B1y4+5v1keI3Yj+YX/2GTFcEOl1Gdw6j8MML+hwxbugXVhEUs B/dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=FkvNTnGzML/l3MPIukvMNKVroQHqJvVMTste4GPwbFM=; b=e+ks+VAnjt/NpO2KDoqaQBlSEwdGO/LoHtX2iJ63J2iEtyUTKVr9TJ18Fp7mhRosh3 6K8/x8OU1RbZxHhBTUmlGCkns11Qh6cd/v65vy/iBbvxwj8HenQ2TVsE7FYqZQaEEF1g lN15FyKcquDhrwq5pYigpirZp3NbREZW1McNN5CevYOq1nL5JpVHSl6YTJBnp/UOmLJF id9O3PBhGEDCKagvYn6YcDQ4OH13YOpdKkSICE/HG/6K9lnVfDTZY6u9ymjQdTwjDE4A Q+6rG9XZ2wzaXsm7t7/VIx/Srik3/GqjhV7k1b4vFypM9O28GpcQqp04R4NFppzWJSHK 22LQ== X-Gm-Message-State: AKGB3mIHJ3Vsz7z+Lg6dS6ITPka2a3JT4wc6ewos7ca485f7suqxX/tN TiJEiCvUi8Xh9vR8iacSXlQTiTk0 X-Google-Smtp-Source: ACJfBosy/gOs7X34TEql5X3GWI25AnsEIaOXlj1UKQMmEOPPrtFqliE0UL4XHmWygMyuK6lw2k6Ijg== X-Received: by 10.98.110.193 with SMTP id j184mr22360961pfc.187.1514192977097; Mon, 25 Dec 2017 01:09:37 -0800 (PST) Received: from localhost ([175.41.48.77]) by smtp.gmail.com with ESMTPSA id m11sm48591618pfh.35.2017.12.25.01.09.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Dec 2017 01:09:35 -0800 (PST) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 5/5] misc: rtsx: Fix symbol clashes Date: Mon, 25 Dec 2017 17:09:11 +0800 Message-Id: <1514192951-6733-7-git-send-email-acelan.kao@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514192951-6733-1-git-send-email-acelan.kao@canonical.com> References: <1514192951-6733-1-git-send-email-acelan.kao@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Stephen Rothwell BugLink: http://bugs.launchpad.net/bugs/1737673 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 Fixes: 5da4e04ae480 ("misc: rtsx: Add support for RTS5260") Signed-off-by: Stephen Rothwell Signed-off-by: Lee Jones (cherry picked from commit 51bd7125f740a1bc9e79cd117d7d50f1dc67a446 mfd/ib-mfd-memstick-misc-mmc-4.16) Signed-off-by: AceLan Kao --- 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 3b30864..07cb93a 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 8ef0bfd..641c340 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 c544e35..6ea1655 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