diff options
| author | Chris Boot <bootc@bootc.net> | 2006-09-29 01:59:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 09:18:06 -0700 |
| commit | cfedc920a7bca828fd4af8e203f7d8514990f999 (patch) | |
| tree | bde0f40c77b9e433652492e9ffc9301506be3ea9 /drivers/leds/leds-net48xx.c | |
| parent | 58012cd788443b9d144bd7c72260a84b6b30f45d (diff) | |
| download | linux-cfedc920a7bca828fd4af8e203f7d8514990f999.tar.gz linux-cfedc920a7bca828fd4af8e203f7d8514990f999.tar.bz2 linux-cfedc920a7bca828fd4af8e203f7d8514990f999.zip | |
[PATCH] Make net48xx-led use scx200_gpio_ops
Make the next48xx LED code use scx200_gpio_ops instead of raw SCx200 GPIO
accesses.
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/leds-net48xx.c')
| -rw-r--r-- | drivers/leds/leds-net48xx.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/leds/leds-net48xx.c b/drivers/leds/leds-net48xx.c index 713c4a8aa77d..45ba3d45bcb8 100644 --- a/drivers/leds/leds-net48xx.c +++ b/drivers/leds/leds-net48xx.c @@ -16,6 +16,7 @@ #include <linux/leds.h> #include <linux/err.h> #include <asm/io.h> +#include <linux/nsc_gpio.h> #include <linux/scx200_gpio.h> #define DRVNAME "net48xx-led" @@ -26,10 +27,7 @@ static struct platform_device *pdev; static void net48xx_error_led_set(struct led_classdev *led_cdev, enum led_brightness value) { - if (value) - scx200_gpio_set_high(NET48XX_ERROR_LED_GPIO); - else - scx200_gpio_set_low(NET48XX_ERROR_LED_GPIO); + scx200_gpio_ops.gpio_set(NET48XX_ERROR_LED_GPIO, value ? 1 : 0); } static struct led_classdev net48xx_error_led = { @@ -81,7 +79,8 @@ static int __init net48xx_led_init(void) { int ret; - if (!scx200_gpio_present()) { + /* small hack, but scx200_gpio doesn't set .dev if the probe fails */ + if (!scx200_gpio_ops.dev) { ret = -ENODEV; goto out; } |