| Message ID | 20230801173544.1929519-3-hch@lst.de |
|---|---|
| State | New |
| Headers | show |
| Series | [1/5] ARM: pxa: remove use of symbol_get() | expand |
On Tue, Aug 1, 2023 at 7:36 PM 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. The carddetection stuff is entirely system-specific, I don't want the driver littered with board-custom stuff; I'm fine with it being built-in only. > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > 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(-) Ok For me. If it matters: Acked-by: Manuel Lauss <manuel.lauss@gmail.com> Thanks! Manuel
On Tue, Aug 1, 2023, at 19:35, Christoph Hellwig 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> Good idea. > 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 needs a depends on MMC=y otherwise you get a link failure with CONFIG_MMC=m and CONFIG_MMC_AU1X=y. With that fixed, Reviewed-by: Arnd Bergmann <arnd@arndb.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 >
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.
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> --- 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(-)