| Message ID | 20220427125557.1608825-1-linus.walleij@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mmc: mmci: Remove custom ios handler | expand |
On Wed, 27 Apr 2022 at 14:58, Linus Walleij <linus.walleij@linaro.org> wrote: > > The custom boardfile ios handler isn't used anywhere in the > kernel. Delete it. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/mmci.c | 4 ---- > include/linux/amba/mmci.h | 6 ------ > 2 files changed, 10 deletions(-) > > diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c > index f3cf3152a397..01159eaf8694 100644 > --- a/drivers/mmc/host/mmci.c > +++ b/drivers/mmc/host/mmci.c > @@ -1748,10 +1748,6 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) > unsigned long flags; > int ret; > > - if (host->plat->ios_handler && > - host->plat->ios_handler(mmc_dev(mmc), ios)) > - dev_err(mmc_dev(mmc), "platform ios_handler failed\n"); > - > switch (ios->power_mode) { > case MMC_POWER_OFF: > if (!IS_ERR(mmc->supply.vmmc)) > diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h > index c92ebc39fc1f..6f96dc2209c0 100644 > --- a/include/linux/amba/mmci.h > +++ b/include/linux/amba/mmci.h > @@ -13,17 +13,11 @@ > * @ocr_mask: available voltages on the 4 pins from the block, this > * is ignored if a regulator is used, see the MMC_VDD_* masks in > * mmc/host.h > - * @ios_handler: a callback function to act on specfic ios changes, > - * used for example to control a levelshifter > - * mask into a value to be binary (or set some other custom bits > - * in MMCIPWR) or:ed and written into the MMCIPWR register of the > - * block. May also control external power based on the power_mode. > * @status: if no GPIO line was given to the block in this function will > * be called to determine whether a card is present in the MMC slot or not > */ > struct mmci_platform_data { > unsigned int ocr_mask; > - int (*ios_handler)(struct device *, struct mmc_ios *); > unsigned int (*status)(struct device *); > }; > > -- > 2.35.1 >
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index f3cf3152a397..01159eaf8694 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1748,10 +1748,6 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) unsigned long flags; int ret; - if (host->plat->ios_handler && - host->plat->ios_handler(mmc_dev(mmc), ios)) - dev_err(mmc_dev(mmc), "platform ios_handler failed\n"); - switch (ios->power_mode) { case MMC_POWER_OFF: if (!IS_ERR(mmc->supply.vmmc)) diff --git a/include/linux/amba/mmci.h b/include/linux/amba/mmci.h index c92ebc39fc1f..6f96dc2209c0 100644 --- a/include/linux/amba/mmci.h +++ b/include/linux/amba/mmci.h @@ -13,17 +13,11 @@ * @ocr_mask: available voltages on the 4 pins from the block, this * is ignored if a regulator is used, see the MMC_VDD_* masks in * mmc/host.h - * @ios_handler: a callback function to act on specfic ios changes, - * used for example to control a levelshifter - * mask into a value to be binary (or set some other custom bits - * in MMCIPWR) or:ed and written into the MMCIPWR register of the - * block. May also control external power based on the power_mode. * @status: if no GPIO line was given to the block in this function will * be called to determine whether a card is present in the MMC slot or not */ struct mmci_platform_data { unsigned int ocr_mask; - int (*ios_handler)(struct device *, struct mmc_ios *); unsigned int (*status)(struct device *); };
The custom boardfile ios handler isn't used anywhere in the kernel. Delete it. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/mmc/host/mmci.c | 4 ---- include/linux/amba/mmci.h | 6 ------ 2 files changed, 10 deletions(-)