Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f64d642 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Tejun Heo
Browse files

ata: sata_rcar: Remove obsolete platform_device_id entries 



Since commit c99cd90d ("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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent fec7bc43

drivers/ata/sata_rcar.c

+3 −12
Original line number Diff line number Diff line
@@ -862,13 +862,6 @@ static struct of_device_id sata_rcar_match[] = { 
};

MODULE_DEVICE_TABLE(of, sata_rcar_match);



static const struct platform_device_id sata_rcar_id_table[] = {

	{ "sata_rcar", RCAR_GEN1_SATA }, /* Deprecated by "sata-r8a7779" */

	{ "sata-r8a7779", RCAR_GEN1_SATA },

	{ },

};

MODULE_DEVICE_TABLE(platform, sata_rcar_id_table);



static int sata_rcar_probe(struct platform_device *pdev)

{

	const struct of_device_id *of_id;
@@ -888,11 +881,10 @@ static int sata_rcar_probe(struct platform_device *pdev) 
		return -ENOMEM;



	of_id = of_match_device(sata_rcar_match, &pdev->dev);

	if (of_id)

		priv->type = (enum sata_rcar_type)of_id->data;

	else

		priv->type = platform_get_device_id(pdev)->driver_data;

	if (!of_id)

		return -ENODEV;



	priv->type = (enum sata_rcar_type)of_id->data;

	priv->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(priv->clk)) {

		dev_err(&pdev->dev, "failed to get access to sata clock\n");
@@ -1022,7 +1014,6 @@ static const struct dev_pm_ops sata_rcar_pm_ops = { 
static struct platform_driver sata_rcar_driver = {

	.probe		= sata_rcar_probe,

	.remove		= sata_rcar_remove,

	.id_table	= sata_rcar_id_table,

	.driver = {

		.name		= DRV_NAME,

		.of_match_table	= sata_rcar_match,