From: Ulf Hansson <ulf.hansson@linaro.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Luis Chamberlain <mcgrof@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Daniel Mack <daniel@zonque.org>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Robert Jarzmik <robert.jarzmik@free.fr>,
Manuel Lauss <manuel.lauss@gmail.com>,
Yangbo Lu <yangbo.lu@nxp.com>, Joshua Kinard <kumba@gentoo.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
open list <linux-kernel@vger.kernel.org>,
linux-mmc@vger.kernel.org, netdev@vger.kernel.org,
linux-rtc@vger.kernel.org, linux-modules@vger.kernel.org
Subject: Re: [PATCH 2/5] mmc: au1xmmc: force non-modular build and remove symbol_get usage
Date: Tue, 8 Aug 2023 11:15:23 +0200 [thread overview]
Message-ID: <CAPDyKForXd2GFVmXXM8hsnAYSQcKhp84t1aOunppUY+MFe0qag@mail.gmail.com> (raw)
In-Reply-To: <20230801173544.1929519-3-hch@lst.de>
On Tue, 1 Aug 2023 at 19:36, Christoph Hellwig <hch@lst.de> wrote:
>
> au1xmmc is split somewhat awkwardly into the main mmc subsystem driver,
> and callbacks in platform_data that sit under arch/mips/ and are
> always built in. The latter than call mmc_detect_change through
> symbol_get. Remove the use of symbol_get by requiring the driver
> to be built in. In the future the interrupt handlers for card
> insert/eject detection should probably be moved into the main driver,
> and which point it can be built modular again.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
If not too late, feel free to add:
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Kind regards
Uffe
> ---
> arch/mips/alchemy/devboards/db1000.c | 8 +-------
> arch/mips/alchemy/devboards/db1200.c | 19 ++-----------------
> arch/mips/alchemy/devboards/db1300.c | 10 +---------
> drivers/mmc/host/Kconfig | 4 ++--
> 4 files changed, 6 insertions(+), 35 deletions(-)
>
> diff --git a/arch/mips/alchemy/devboards/db1000.c b/arch/mips/alchemy/devboards/db1000.c
> index 79d66faa84828d..012da042d0a4f7 100644
> --- a/arch/mips/alchemy/devboards/db1000.c
> +++ b/arch/mips/alchemy/devboards/db1000.c
> @@ -14,7 +14,6 @@
> #include <linux/interrupt.h>
> #include <linux/leds.h>
> #include <linux/mmc/host.h>
> -#include <linux/module.h>
> #include <linux/platform_device.h>
> #include <linux/pm.h>
> #include <linux/spi/spi.h>
> @@ -167,12 +166,7 @@ static struct platform_device db1x00_audio_dev = {
>
> static irqreturn_t db1100_mmc_cd(int irq, void *ptr)
> {
> - void (*mmc_cd)(struct mmc_host *, unsigned long);
> - /* link against CONFIG_MMC=m */
> - mmc_cd = symbol_get(mmc_detect_change);
> - mmc_cd(ptr, msecs_to_jiffies(500));
> - symbol_put(mmc_detect_change);
> -
> + mmc_detect_change(ptr, msecs_to_jiffies(500));
> return IRQ_HANDLED;
> }
>
> diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c
> index 1864eb935ca57f..76080c71a2a7b6 100644
> --- a/arch/mips/alchemy/devboards/db1200.c
> +++ b/arch/mips/alchemy/devboards/db1200.c
> @@ -10,7 +10,6 @@
> #include <linux/gpio.h>
> #include <linux/i2c.h>
> #include <linux/init.h>
> -#include <linux/module.h>
> #include <linux/interrupt.h>
> #include <linux/io.h>
> #include <linux/leds.h>
> @@ -340,14 +339,7 @@ static irqreturn_t db1200_mmc_cd(int irq, void *ptr)
>
> static irqreturn_t db1200_mmc_cdfn(int irq, void *ptr)
> {
> - void (*mmc_cd)(struct mmc_host *, unsigned long);
> -
> - /* link against CONFIG_MMC=m */
> - mmc_cd = symbol_get(mmc_detect_change);
> - if (mmc_cd) {
> - mmc_cd(ptr, msecs_to_jiffies(200));
> - symbol_put(mmc_detect_change);
> - }
> + mmc_detect_change(ptr, msecs_to_jiffies(200));
>
> msleep(100); /* debounce */
> if (irq == DB1200_SD0_INSERT_INT)
> @@ -431,14 +423,7 @@ static irqreturn_t pb1200_mmc1_cd(int irq, void *ptr)
>
> static irqreturn_t pb1200_mmc1_cdfn(int irq, void *ptr)
> {
> - void (*mmc_cd)(struct mmc_host *, unsigned long);
> -
> - /* link against CONFIG_MMC=m */
> - mmc_cd = symbol_get(mmc_detect_change);
> - if (mmc_cd) {
> - mmc_cd(ptr, msecs_to_jiffies(200));
> - symbol_put(mmc_detect_change);
> - }
> + mmc_detect_change(ptr, msecs_to_jiffies(200));
>
> msleep(100); /* debounce */
> if (irq == PB1200_SD1_INSERT_INT)
> diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
> index e70e529ddd914d..ff61901329c626 100644
> --- a/arch/mips/alchemy/devboards/db1300.c
> +++ b/arch/mips/alchemy/devboards/db1300.c
> @@ -17,7 +17,6 @@
> #include <linux/interrupt.h>
> #include <linux/ata_platform.h>
> #include <linux/mmc/host.h>
> -#include <linux/module.h>
> #include <linux/mtd/mtd.h>
> #include <linux/mtd/platnand.h>
> #include <linux/platform_device.h>
> @@ -459,14 +458,7 @@ static irqreturn_t db1300_mmc_cd(int irq, void *ptr)
>
> static irqreturn_t db1300_mmc_cdfn(int irq, void *ptr)
> {
> - void (*mmc_cd)(struct mmc_host *, unsigned long);
> -
> - /* link against CONFIG_MMC=m. We can only be called once MMC core has
> - * initialized the controller, so symbol_get() should always succeed.
> - */
> - mmc_cd = symbol_get(mmc_detect_change);
> - mmc_cd(ptr, msecs_to_jiffies(200));
> - symbol_put(mmc_detect_change);
> + mmc_detect_change(ptr, msecs_to_jiffies(200));
>
> msleep(100); /* debounce */
> if (irq == DB1300_SD1_INSERT_INT)
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 159a3e9490aed8..f7afd179dd10bf 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -526,11 +526,11 @@ config MMC_ALCOR
> of Alcor Micro PCI-E card reader
>
> config MMC_AU1X
> - tristate "Alchemy AU1XX0 MMC Card Interface support"
> + bool "Alchemy AU1XX0 MMC Card Interface support"
> depends on MIPS_ALCHEMY
> help
> This selects the AMD Alchemy(R) Multimedia card interface.
> - If you have a Alchemy platform with a MMC slot, say Y or M here.
> + If you have a Alchemy platform with a MMC slot, say Y here.
>
> If unsure, say N.
>
> --
> 2.39.2
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Ulf Hansson <ulf.hansson@linaro.org>
To: Christoph Hellwig <hch@lst.de>
Cc: Luis Chamberlain <mcgrof@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Daniel Mack <daniel@zonque.org>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Robert Jarzmik <robert.jarzmik@free.fr>,
Manuel Lauss <manuel.lauss@gmail.com>,
Yangbo Lu <yangbo.lu@nxp.com>, Joshua Kinard <kumba@gentoo.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
open list <linux-kernel@vger.kernel.org>,
linux-mmc@vger.kernel.org, netdev@vger.kernel.org,
linux-rtc@vger.kernel.org, linux-modules@vger.kernel.org
Subject: Re: [PATCH 2/5] mmc: au1xmmc: force non-modular build and remove symbol_get usage
Date: Tue, 8 Aug 2023 11:15:23 +0200 [thread overview]
Message-ID: <CAPDyKForXd2GFVmXXM8hsnAYSQcKhp84t1aOunppUY+MFe0qag@mail.gmail.com> (raw)
In-Reply-To: <20230801173544.1929519-3-hch@lst.de>
On Tue, 1 Aug 2023 at 19:36, Christoph Hellwig <hch@lst.de> wrote:
>
> au1xmmc is split somewhat awkwardly into the main mmc subsystem driver,
> and callbacks in platform_data that sit under arch/mips/ and are
> always built in. The latter than call mmc_detect_change through
> symbol_get. Remove the use of symbol_get by requiring the driver
> to be built in. In the future the interrupt handlers for card
> insert/eject detection should probably be moved into the main driver,
> and which point it can be built modular again.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
If not too late, feel free to add:
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Kind regards
Uffe
> ---
> arch/mips/alchemy/devboards/db1000.c | 8 +-------
> arch/mips/alchemy/devboards/db1200.c | 19 ++-----------------
> arch/mips/alchemy/devboards/db1300.c | 10 +---------
> drivers/mmc/host/Kconfig | 4 ++--
> 4 files changed, 6 insertions(+), 35 deletions(-)
>
> diff --git a/arch/mips/alchemy/devboards/db1000.c b/arch/mips/alchemy/devboards/db1000.c
> index 79d66faa84828d..012da042d0a4f7 100644
> --- a/arch/mips/alchemy/devboards/db1000.c
> +++ b/arch/mips/alchemy/devboards/db1000.c
> @@ -14,7 +14,6 @@
> #include <linux/interrupt.h>
> #include <linux/leds.h>
> #include <linux/mmc/host.h>
> -#include <linux/module.h>
> #include <linux/platform_device.h>
> #include <linux/pm.h>
> #include <linux/spi/spi.h>
> @@ -167,12 +166,7 @@ static struct platform_device db1x00_audio_dev = {
>
> static irqreturn_t db1100_mmc_cd(int irq, void *ptr)
> {
> - void (*mmc_cd)(struct mmc_host *, unsigned long);
> - /* link against CONFIG_MMC=m */
> - mmc_cd = symbol_get(mmc_detect_change);
> - mmc_cd(ptr, msecs_to_jiffies(500));
> - symbol_put(mmc_detect_change);
> -
> + mmc_detect_change(ptr, msecs_to_jiffies(500));
> return IRQ_HANDLED;
> }
>
> diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c
> index 1864eb935ca57f..76080c71a2a7b6 100644
> --- a/arch/mips/alchemy/devboards/db1200.c
> +++ b/arch/mips/alchemy/devboards/db1200.c
> @@ -10,7 +10,6 @@
> #include <linux/gpio.h>
> #include <linux/i2c.h>
> #include <linux/init.h>
> -#include <linux/module.h>
> #include <linux/interrupt.h>
> #include <linux/io.h>
> #include <linux/leds.h>
> @@ -340,14 +339,7 @@ static irqreturn_t db1200_mmc_cd(int irq, void *ptr)
>
> static irqreturn_t db1200_mmc_cdfn(int irq, void *ptr)
> {
> - void (*mmc_cd)(struct mmc_host *, unsigned long);
> -
> - /* link against CONFIG_MMC=m */
> - mmc_cd = symbol_get(mmc_detect_change);
> - if (mmc_cd) {
> - mmc_cd(ptr, msecs_to_jiffies(200));
> - symbol_put(mmc_detect_change);
> - }
> + mmc_detect_change(ptr, msecs_to_jiffies(200));
>
> msleep(100); /* debounce */
> if (irq == DB1200_SD0_INSERT_INT)
> @@ -431,14 +423,7 @@ static irqreturn_t pb1200_mmc1_cd(int irq, void *ptr)
>
> static irqreturn_t pb1200_mmc1_cdfn(int irq, void *ptr)
> {
> - void (*mmc_cd)(struct mmc_host *, unsigned long);
> -
> - /* link against CONFIG_MMC=m */
> - mmc_cd = symbol_get(mmc_detect_change);
> - if (mmc_cd) {
> - mmc_cd(ptr, msecs_to_jiffies(200));
> - symbol_put(mmc_detect_change);
> - }
> + mmc_detect_change(ptr, msecs_to_jiffies(200));
>
> msleep(100); /* debounce */
> if (irq == PB1200_SD1_INSERT_INT)
> diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
> index e70e529ddd914d..ff61901329c626 100644
> --- a/arch/mips/alchemy/devboards/db1300.c
> +++ b/arch/mips/alchemy/devboards/db1300.c
> @@ -17,7 +17,6 @@
> #include <linux/interrupt.h>
> #include <linux/ata_platform.h>
> #include <linux/mmc/host.h>
> -#include <linux/module.h>
> #include <linux/mtd/mtd.h>
> #include <linux/mtd/platnand.h>
> #include <linux/platform_device.h>
> @@ -459,14 +458,7 @@ static irqreturn_t db1300_mmc_cd(int irq, void *ptr)
>
> static irqreturn_t db1300_mmc_cdfn(int irq, void *ptr)
> {
> - void (*mmc_cd)(struct mmc_host *, unsigned long);
> -
> - /* link against CONFIG_MMC=m. We can only be called once MMC core has
> - * initialized the controller, so symbol_get() should always succeed.
> - */
> - mmc_cd = symbol_get(mmc_detect_change);
> - mmc_cd(ptr, msecs_to_jiffies(200));
> - symbol_put(mmc_detect_change);
> + mmc_detect_change(ptr, msecs_to_jiffies(200));
>
> msleep(100); /* debounce */
> if (irq == DB1300_SD1_INSERT_INT)
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 159a3e9490aed8..f7afd179dd10bf 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -526,11 +526,11 @@ config MMC_ALCOR
> of Alcor Micro PCI-E card reader
>
> config MMC_AU1X
> - tristate "Alchemy AU1XX0 MMC Card Interface support"
> + bool "Alchemy AU1XX0 MMC Card Interface support"
> depends on MIPS_ALCHEMY
> help
> This selects the AMD Alchemy(R) Multimedia card interface.
> - If you have a Alchemy platform with a MMC slot, say Y or M here.
> + If you have a Alchemy platform with a MMC slot, say Y here.
>
> If unsure, say N.
>
> --
> 2.39.2
>
next prev parent reply other threads:[~2023-08-08 9:16 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-01 17:35 require EXPORT_SYMBOL_GPL symbols for symbol_get v2 Christoph Hellwig
2023-08-01 17:35 ` Christoph Hellwig
2023-08-01 17:35 ` [PATCH 1/5] ARM: pxa: remove use of symbol_get() Christoph Hellwig
2023-08-01 17:35 ` Christoph Hellwig
2023-08-01 17:35 ` [PATCH 2/5] mmc: au1xmmc: force non-modular build and remove symbol_get usage Christoph Hellwig
2023-08-01 17:35 ` Christoph Hellwig
2023-08-02 7:12 ` Manuel Lauss
2023-08-02 7:12 ` Manuel Lauss
2023-08-02 8:31 ` Arnd Bergmann
2023-08-02 8:31 ` Arnd Bergmann
2023-08-08 9:15 ` Ulf Hansson [this message]
2023-08-08 9:15 ` Ulf Hansson
2023-08-01 17:35 ` [PATCH 3/5] net: enetc: use EXPORT_SYMBOL_GPL for enetc_phc_index Christoph Hellwig
2023-08-01 17:35 ` Christoph Hellwig
2023-08-01 17:35 ` [PATCH 4/5] rtc: ds1685: use EXPORT_SYMBOL_GPL for ds1685_rtc_poweroff Christoph Hellwig
2023-08-01 17:35 ` Christoph Hellwig
2023-08-01 17:35 ` [PATCH 5/5] modules: only allow symbol_get of EXPORT_SYMBOL_GPL modules Christoph Hellwig
2023-08-01 17:35 ` Christoph Hellwig
2023-10-18 0:30 ` David Woodhouse
2023-10-18 0:30 ` David Woodhouse
2023-10-18 5:31 ` Christoph Hellwig
2023-10-18 5:31 ` Christoph Hellwig
2023-10-18 18:25 ` Luis Chamberlain
2023-10-18 18:25 ` Luis Chamberlain
2023-08-01 17:45 ` require EXPORT_SYMBOL_GPL symbols for symbol_get v2 Luis Chamberlain
2023-08-01 17:45 ` Luis Chamberlain
2023-08-02 11:56 ` Christoph Hellwig
2023-08-02 11:56 ` Christoph Hellwig
2023-08-02 18:19 ` Luis Chamberlain
2023-08-02 18:19 ` Luis Chamberlain
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=CAPDyKForXd2GFVmXXM8hsnAYSQcKhp84t1aOunppUY+MFe0qag@mail.gmail.com \
--to=ulf.hansson@linaro.org \
--cc=arnd@arndb.de \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel@zonque.org \
--cc=gregkh@linuxfoundation.org \
--cc=haojian.zhuang@gmail.com \
--cc=hch@lst.de \
--cc=kumba@gentoo.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=manuel.lauss@gmail.com \
--cc=mcgrof@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=robert.jarzmik@free.fr \
--cc=yangbo.lu@nxp.com \
/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.