On Mon, 23 Nov 2020 at 20:26, Fabio Estevam <festevam@xxxxxxxxx> wrote:
>
> The mxs-mmc driver is only used by DT platforms and the .id_table
> is unused.
>
> Get rid of it to simplify the code.
>
> While at it, use of_device_get_match_data() to retrieve the driver
> data.
>
> Signed-off-by: Fabio Estevam <festevam@xxxxxxxxx>
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/mxs-mmc.c | 18 +-----------------
> 1 file changed, 1 insertion(+), 17 deletions(-)
>
> diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
> index 75007f61df97..56bbc6cd9c84 100644
> --- a/drivers/mmc/host/mxs-mmc.c
> +++ b/drivers/mmc/host/mxs-mmc.c
> @@ -545,19 +545,6 @@ static const struct mmc_host_ops mxs_mmc_ops = {
> .enable_sdio_irq = mxs_mmc_enable_sdio_irq,
> };
>
> -static const struct platform_device_id mxs_ssp_ids[] = {
> - {
> - .name = "imx23-mmc",
> - .driver_data = IMX23_SSP,
> - }, {
> - .name = "imx28-mmc",
> - .driver_data = IMX28_SSP,
> - }, {
> - /* sentinel */
> - }
> -};
> -MODULE_DEVICE_TABLE(platform, mxs_ssp_ids);
> -
> static const struct of_device_id mxs_mmc_dt_ids[] = {
> { .compatible = "fsl,imx23-mmc", .data = (void *) IMX23_SSP, },
> { .compatible = "fsl,imx28-mmc", .data = (void *) IMX28_SSP, },
> @@ -567,8 +554,6 @@ MODULE_DEVICE_TABLE(of, mxs_mmc_dt_ids);
>
> static int mxs_mmc_probe(struct platform_device *pdev)
> {
> - const struct of_device_id *of_id =
> - of_match_device(mxs_mmc_dt_ids, &pdev->dev);
> struct device_node *np = pdev->dev.of_node;
> struct mxs_mmc_host *host;
> struct mmc_host *mmc;
> @@ -593,7 +578,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
> goto out_mmc_free;
> }
>
> - ssp->devid = (enum mxs_ssp_id) of_id->data;
> + ssp->devid = (enum mxs_ssp_id)of_device_get_match_data(&pdev->dev);
>
> host->mmc = mmc;
> host->sdio_irq_en = 0;
> @@ -723,7 +708,6 @@ static SIMPLE_DEV_PM_OPS(mxs_mmc_pm_ops, mxs_mmc_suspend, mxs_mmc_resume);
> static struct platform_driver mxs_mmc_driver = {
> .probe = mxs_mmc_probe,
> .remove = mxs_mmc_remove,
> - .id_table = mxs_ssp_ids,
> .driver = {
> .name = DRIVER_NAME,
> .probe_type = PROBE_PREFER_ASYNCHRONOUS,
> --
> 2.17.1
>
