* Re: [PATCH] ata: sata_rcar: Remove obsolete sata-r8a779* platform_device_id entries
2015-06-23 12:55 [PATCH] ata: sata_rcar: Remove obsolete sata-r8a779* platform_device_id entries Geert Uytterhoeven
@ 2015-06-23 23:48 ` Simon Horman
2015-07-14 21:39 ` Tejun Heo
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2015-06-23 23:48 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Tejun Heo, linux-ide, linux-sh
On Tue, Jun 23, 2015 at 02:55:13PM +0200, Geert Uytterhoeven wrote:
> Since commit a483dcbfa21f919c ("ARM: shmobile: lager: Remove legacy
> board support"), R-Car Gen2 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 corresponding
> platform_device_id entry.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
> ---
> drivers/ata/sata_rcar.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c
> index d49a5193b7de9e94..8804127b108c0f8e 100644
> --- a/drivers/ata/sata_rcar.c
> +++ b/drivers/ata/sata_rcar.c
> @@ -861,10 +861,6 @@ 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 },
> - { "sata-r8a7790", RCAR_GEN2_SATA },
> - { "sata-r8a7790-es1", RCAR_R8A7790_ES1_SATA },
> - { "sata-r8a7791", RCAR_GEN2_SATA },
> - { "sata-r8a7793", RCAR_GEN2_SATA },
> { },
> };
> MODULE_DEVICE_TABLE(platform, sata_rcar_id_table);
> --
> 1.9.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] ata: sata_rcar: Remove obsolete sata-r8a779* platform_device_id entries
2015-06-23 12:55 [PATCH] ata: sata_rcar: Remove obsolete sata-r8a779* platform_device_id entries Geert Uytterhoeven
2015-06-23 23:48 ` Simon Horman
@ 2015-07-14 21:39 ` Tejun Heo
2015-10-07 10:57 ` [PATCH] ata: sata_rcar: Remove obsolete " Geert Uytterhoeven
2015-11-24 14:45 ` Geert Uytterhoeven
3 siblings, 0 replies; 7+ messages in thread
From: Tejun Heo @ 2015-07-14 21:39 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: linux-ide, linux-sh
On Tue, Jun 23, 2015 at 02:55:13PM +0200, Geert Uytterhoeven wrote:
> Since commit a483dcbfa21f919c ("ARM: shmobile: lager: Remove legacy
> board support"), R-Car Gen2 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 corresponding
> platform_device_id entry.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Applied to libata/for-4.3.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH] ata: sata_rcar: Remove obsolete platform_device_id entries
2015-06-23 12:55 [PATCH] ata: sata_rcar: Remove obsolete sata-r8a779* platform_device_id entries Geert Uytterhoeven
2015-06-23 23:48 ` Simon Horman
2015-07-14 21:39 ` Tejun Heo
@ 2015-10-07 10:57 ` Geert Uytterhoeven
2015-10-08 2:11 ` Simon Horman
2015-11-24 14:45 ` Geert Uytterhoeven
3 siblings, 1 reply; 7+ messages in thread
From: Geert Uytterhoeven @ 2015-10-07 10:57 UTC (permalink / raw)
To: Tejun Heo; +Cc: linux-ide, linux-sh, Geert Uytterhoeven
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>
---
drivers/ata/sata_rcar.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c
index 8804127b108c..d8bbe8b7c479 100644
--- a/drivers/ata/sata_rcar.c
+++ b/drivers/ata/sata_rcar.c
@@ -858,13 +858,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;
@@ -884,11 +877,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");
@@ -1018,7 +1010,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,
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] ata: sata_rcar: Remove obsolete platform_device_id entries
2015-10-07 10:57 ` [PATCH] ata: sata_rcar: Remove obsolete " Geert Uytterhoeven
@ 2015-10-08 2:11 ` Simon Horman
0 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2015-10-08 2:11 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Tejun Heo, linux-ide, linux-sh
On Wed, Oct 07, 2015 at 12:57:22PM +0200, Geert Uytterhoeven wrote:
> 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>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ata: sata_rcar: Remove obsolete platform_device_id entries
2015-06-23 12:55 [PATCH] ata: sata_rcar: Remove obsolete sata-r8a779* platform_device_id entries Geert Uytterhoeven
` (2 preceding siblings ...)
2015-10-07 10:57 ` [PATCH] ata: sata_rcar: Remove obsolete " Geert Uytterhoeven
@ 2015-11-24 14:45 ` Geert Uytterhoeven
2015-11-24 14:55 ` Tejun Heo
3 siblings, 1 reply; 7+ messages in thread
From: Geert Uytterhoeven @ 2015-11-24 14:45 UTC (permalink / raw)
To: Tejun Heo; +Cc: linux-ide, linux-sh, Geert Uytterhoeven
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>
---
v2:
- Add Acked-by.
---
drivers/ata/sata_rcar.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c
index 2b20b31f317d0509..f72d601e300aa9f8 100644
--- a/drivers/ata/sata_rcar.c
+++ b/drivers/ata/sata_rcar.c
@@ -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,
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] ata: sata_rcar: Remove obsolete platform_device_id entries
2015-11-24 14:45 ` Geert Uytterhoeven
@ 2015-11-24 14:55 ` Tejun Heo
0 siblings, 0 replies; 7+ messages in thread
From: Tejun Heo @ 2015-11-24 14:55 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: linux-ide, linux-sh
On Tue, Nov 24, 2015 at 03:45:04PM +0100, Geert Uytterhoeven wrote:
> 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>
Applied to libata/for-4.5.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 7+ messages in thread