| From 8f550fbf0ea0e211a844a90f025b70039b05d9a2 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Thu, 20 Feb 2014 16:54:44 -0800 |
| Subject: mmc: sdhi: tidyup sh_mobile_sdhi_of_match position |
| |
| It is easier to read if sh_mobile_sdhi_of_cfg and |
| sh_mobile_sdhi_of_match are closer. |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Acked-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Chris Ball <chris@printf.net> |
| (cherry picked from commit 2772ef30eacd72fef013ac2fade2f384342ba6c7) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/sh_mobile_sdhi.c | 26 +++++++++++++------------- |
| 1 file changed, 13 insertions(+), 13 deletions(-) |
| |
| diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c |
| index 03fe7518bba4..a7a3f689a309 100644 |
| --- a/drivers/mmc/host/sh_mobile_sdhi.c |
| +++ b/drivers/mmc/host/sh_mobile_sdhi.c |
| @@ -45,6 +45,19 @@ static const struct sh_mobile_sdhi_of_data sh_mobile_sdhi_of_cfg[] = { |
| }, |
| }; |
| |
| +static const struct of_device_id sh_mobile_sdhi_of_match[] = { |
| + { .compatible = "renesas,sdhi-shmobile" }, |
| + { .compatible = "renesas,sdhi-sh7372" }, |
| + { .compatible = "renesas,sdhi-sh73a0", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| + { .compatible = "renesas,sdhi-r8a73a4", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| + { .compatible = "renesas,sdhi-r8a7740", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| + { .compatible = "renesas,sdhi-r8a7778", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| + { .compatible = "renesas,sdhi-r8a7779", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| + { .compatible = "renesas,sdhi-r8a7790", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| + {}, |
| +}; |
| +MODULE_DEVICE_TABLE(of, sh_mobile_sdhi_of_match); |
| + |
| struct sh_mobile_sdhi { |
| struct clk *clk; |
| struct tmio_mmc_data mmc_data; |
| @@ -114,19 +127,6 @@ static const struct sh_mobile_sdhi_ops sdhi_ops = { |
| .cd_wakeup = sh_mobile_sdhi_cd_wakeup, |
| }; |
| |
| -static const struct of_device_id sh_mobile_sdhi_of_match[] = { |
| - { .compatible = "renesas,sdhi-shmobile" }, |
| - { .compatible = "renesas,sdhi-sh7372" }, |
| - { .compatible = "renesas,sdhi-sh73a0", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| - { .compatible = "renesas,sdhi-r8a73a4", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| - { .compatible = "renesas,sdhi-r8a7740", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| - { .compatible = "renesas,sdhi-r8a7778", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| - { .compatible = "renesas,sdhi-r8a7779", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| - { .compatible = "renesas,sdhi-r8a7790", .data = &sh_mobile_sdhi_of_cfg[0], }, |
| - {}, |
| -}; |
| -MODULE_DEVICE_TABLE(of, sh_mobile_sdhi_of_match); |
| - |
| static int sh_mobile_sdhi_probe(struct platform_device *pdev) |
| { |
| const struct of_device_id *of_id = |
| -- |
| 2.1.2 |
| |