diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-10-11 02:27:34 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-14 00:53:12 -0400 |
commit | a2cd15586e630b0870bf34783568d83901890743 (patch) | |
tree | cb914a4b6c2531d2a9aabca708992672dc76a442 /arch/sparc64/kernel | |
parent | 7379b42b607782695f49d05c80d3eb99e5072908 (diff) |
[SPARC/64]: Move of_platform_driver initialisations: arch/sparc{,64}.
We no longer initialise the name field of the of_platform_driver, but
use the name field of the embedded device_driver's name field instead.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel')
-rw-r--r-- | arch/sparc64/kernel/auxio.c | 4 | ||||
-rw-r--r-- | arch/sparc64/kernel/power.c | 4 | ||||
-rw-r--r-- | arch/sparc64/kernel/time.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/arch/sparc64/kernel/auxio.c b/arch/sparc64/kernel/auxio.c index 7b379761e9f8..c55f0293eacd 100644 --- a/arch/sparc64/kernel/auxio.c +++ b/arch/sparc64/kernel/auxio.c | |||
@@ -148,9 +148,11 @@ static int __devinit auxio_probe(struct of_device *dev, const struct of_device_i | |||
148 | } | 148 | } |
149 | 149 | ||
150 | static struct of_platform_driver auxio_driver = { | 150 | static struct of_platform_driver auxio_driver = { |
151 | .name = "auxio", | ||
152 | .match_table = auxio_match, | 151 | .match_table = auxio_match, |
153 | .probe = auxio_probe, | 152 | .probe = auxio_probe, |
153 | .driver = { | ||
154 | .name = "auxio", | ||
155 | }, | ||
154 | }; | 156 | }; |
155 | 157 | ||
156 | static int __init auxio_init(void) | 158 | static int __init auxio_init(void) |
diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c index 881a09ee4c4c..850cdffdd69c 100644 --- a/arch/sparc64/kernel/power.c +++ b/arch/sparc64/kernel/power.c | |||
@@ -105,9 +105,11 @@ static struct of_device_id power_match[] = { | |||
105 | }; | 105 | }; |
106 | 106 | ||
107 | static struct of_platform_driver power_driver = { | 107 | static struct of_platform_driver power_driver = { |
108 | .name = "power", | ||
109 | .match_table = power_match, | 108 | .match_table = power_match, |
110 | .probe = power_probe, | 109 | .probe = power_probe, |
110 | .driver = { | ||
111 | .name = "power", | ||
112 | }, | ||
111 | }; | 113 | }; |
112 | 114 | ||
113 | void __init power_init(void) | 115 | void __init power_init(void) |
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c index 69cad1b653c1..cd8c740cba1d 100644 --- a/arch/sparc64/kernel/time.c +++ b/arch/sparc64/kernel/time.c | |||
@@ -764,9 +764,11 @@ static struct of_device_id clock_match[] = { | |||
764 | }; | 764 | }; |
765 | 765 | ||
766 | static struct of_platform_driver clock_driver = { | 766 | static struct of_platform_driver clock_driver = { |
767 | .name = "clock", | ||
768 | .match_table = clock_match, | 767 | .match_table = clock_match, |
769 | .probe = clock_probe, | 768 | .probe = clock_probe, |
769 | .driver = { | ||
770 | .name = "clock", | ||
771 | }, | ||
770 | }; | 772 | }; |
771 | 773 | ||
772 | static int __init clock_init(void) | 774 | static int __init clock_init(void) |