diff options
author | Chris Boot <bootc@bootc.net> | 2006-07-14 03:24:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-15 00:53:54 -0400 |
commit | bca3bffec9f37d4cb60b80fd0067f9c7550b5d57 (patch) | |
tree | 0c06e8375158239dae0983744db2a5638b30ec9f /drivers/leds | |
parent | a4afee02a5dd4f20c08fca26e9b610e72d0bcbf0 (diff) |
[PATCH] net48xx LED cleanups
Add the DRVNAME define to remove the two separate references of the driver
name by string, and move the .driver.owner into the existing .driver
sub-structure.
Signed-off-by: Chris Boot <bootc@bootc.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/leds')
-rw-r--r-- | drivers/leds/leds-net48xx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/leds/leds-net48xx.c b/drivers/leds/leds-net48xx.c index 35ee52f9b79e..713c4a8aa77d 100644 --- a/drivers/leds/leds-net48xx.c +++ b/drivers/leds/leds-net48xx.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <asm/io.h> | 18 | #include <asm/io.h> |
19 | #include <linux/scx200_gpio.h> | 19 | #include <linux/scx200_gpio.h> |
20 | 20 | ||
21 | #define DRVNAME "net48xx-led" | ||
21 | #define NET48XX_ERROR_LED_GPIO 20 | 22 | #define NET48XX_ERROR_LED_GPIO 20 |
22 | 23 | ||
23 | static struct platform_device *pdev; | 24 | static struct platform_device *pdev; |
@@ -66,13 +67,13 @@ static int net48xx_led_remove(struct platform_device *pdev) | |||
66 | } | 67 | } |
67 | 68 | ||
68 | static struct platform_driver net48xx_led_driver = { | 69 | static struct platform_driver net48xx_led_driver = { |
69 | .driver.owner = THIS_MODULE, | ||
70 | .probe = net48xx_led_probe, | 70 | .probe = net48xx_led_probe, |
71 | .remove = net48xx_led_remove, | 71 | .remove = net48xx_led_remove, |
72 | .suspend = net48xx_led_suspend, | 72 | .suspend = net48xx_led_suspend, |
73 | .resume = net48xx_led_resume, | 73 | .resume = net48xx_led_resume, |
74 | .driver = { | 74 | .driver = { |
75 | .name = "net48xx-led", | 75 | .name = DRVNAME, |
76 | .owner = THIS_MODULE, | ||
76 | }, | 77 | }, |
77 | }; | 78 | }; |
78 | 79 | ||
@@ -89,7 +90,7 @@ static int __init net48xx_led_init(void) | |||
89 | if (ret < 0) | 90 | if (ret < 0) |
90 | goto out; | 91 | goto out; |
91 | 92 | ||
92 | pdev = platform_device_register_simple("net48xx-led", -1, NULL, 0); | 93 | pdev = platform_device_register_simple(DRVNAME, -1, NULL, 0); |
93 | if (IS_ERR(pdev)) { | 94 | if (IS_ERR(pdev)) { |
94 | ret = PTR_ERR(pdev); | 95 | ret = PTR_ERR(pdev); |
95 | platform_driver_unregister(&net48xx_led_driver); | 96 | platform_driver_unregister(&net48xx_led_driver); |