Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ata: sata_rcar: Remove obsolete platform_device_id entries

Since commit c99cd90d98a98aa1 ("ARM: shmobile: r8a7779: Remove legacy
SoC code"), R-Car SoCs are only supported in generic DT-only ARM
multi-platform builds. The driver doesn't need to match platform
devices by name anymore, hence remove the remaining platform_device_id
entries and platform device support.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Tejun Heo <tj@kernel.org>

authored by

Geert Uytterhoeven and committed by
Tejun Heo
7f64d642 fec7bc43

+3 -12
+3 -12
drivers/ata/sata_rcar.c
··· 862 862 }; 863 863 MODULE_DEVICE_TABLE(of, sata_rcar_match); 864 864 865 - static const struct platform_device_id sata_rcar_id_table[] = { 866 - { "sata_rcar", RCAR_GEN1_SATA }, /* Deprecated by "sata-r8a7779" */ 867 - { "sata-r8a7779", RCAR_GEN1_SATA }, 868 - { }, 869 - }; 870 - MODULE_DEVICE_TABLE(platform, sata_rcar_id_table); 871 - 872 865 static int sata_rcar_probe(struct platform_device *pdev) 873 866 { 874 867 const struct of_device_id *of_id; ··· 881 888 return -ENOMEM; 882 889 883 890 of_id = of_match_device(sata_rcar_match, &pdev->dev); 884 - if (of_id) 885 - priv->type = (enum sata_rcar_type)of_id->data; 886 - else 887 - priv->type = platform_get_device_id(pdev)->driver_data; 891 + if (!of_id) 892 + return -ENODEV; 888 893 894 + priv->type = (enum sata_rcar_type)of_id->data; 889 895 priv->clk = devm_clk_get(&pdev->dev, NULL); 890 896 if (IS_ERR(priv->clk)) { 891 897 dev_err(&pdev->dev, "failed to get access to sata clock\n"); ··· 1014 1022 static struct platform_driver sata_rcar_driver = { 1015 1023 .probe = sata_rcar_probe, 1016 1024 .remove = sata_rcar_remove, 1017 - .id_table = sata_rcar_id_table, 1018 1025 .driver = { 1019 1026 .name = DRV_NAME, 1020 1027 .of_match_table = sata_rcar_match,