diff mbox series

mmc: meson-gx: constify member data of struct meson_host

Message ID 70e5520f-e327-111d-9ea4-824460e41561@gmail.com (mailing list archive)
State New, archived
Headers show
Series mmc: meson-gx: constify member data of struct meson_host | expand

Commit Message

Heiner Kallweit Feb. 15, 2023, 8:01 p.m. UTC
Constify member data of struct meson_host. This also allows to remove
the cast as of_device_get_match_data() returns a const void *.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/mmc/host/meson-gx-mmc.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Ulf Hansson Feb. 17, 2023, 10:56 a.m. UTC | #1
On Wed, 15 Feb 2023 at 21:01, Heiner Kallweit <hkallweit1@gmail.com> wrote:
>
> Constify member data of struct meson_host. This also allows to remove
> the cast as of_device_get_match_data() returns a const void *.
>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

Applied for next, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/meson-gx-mmc.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
> index 6ed95c555..641ea4292 100644
> --- a/drivers/mmc/host/meson-gx-mmc.c
> +++ b/drivers/mmc/host/meson-gx-mmc.c
> @@ -150,7 +150,7 @@ struct sd_emmc_desc {
>
>  struct meson_host {
>         struct  device          *dev;
> -       struct  meson_mmc_data *data;
> +       const struct meson_mmc_data *data;
>         struct  mmc_host        *mmc;
>         struct  mmc_command     *cmd;
>
> @@ -1195,8 +1195,7 @@ static int meson_mmc_probe(struct platform_device *pdev)
>         if (mmc->caps & MMC_CAP_SDIO_IRQ)
>                 mmc->caps2 |= MMC_CAP2_SDIO_IRQ_NOTHREAD;
>
> -       host->data = (struct meson_mmc_data *)
> -               of_device_get_match_data(&pdev->dev);
> +       host->data = of_device_get_match_data(&pdev->dev);
>         if (!host->data)
>                 return -EINVAL;
>
> --
> 2.39.1
>
diff mbox series

Patch

diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index 6ed95c555..641ea4292 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -150,7 +150,7 @@  struct sd_emmc_desc {
 
 struct meson_host {
 	struct	device		*dev;
-	struct	meson_mmc_data *data;
+	const struct meson_mmc_data *data;
 	struct	mmc_host	*mmc;
 	struct	mmc_command	*cmd;
 
@@ -1195,8 +1195,7 @@  static int meson_mmc_probe(struct platform_device *pdev)
 	if (mmc->caps & MMC_CAP_SDIO_IRQ)
 		mmc->caps2 |= MMC_CAP2_SDIO_IRQ_NOTHREAD;
 
-	host->data = (struct meson_mmc_data *)
-		of_device_get_match_data(&pdev->dev);
+	host->data = of_device_get_match_data(&pdev->dev);
 	if (!host->data)
 		return -EINVAL;