Re: [RESEND][PATCH] Make net48xx-led use scx200_gpio_ops

[Chris Boot <bootc@bootc.net>]

[-- Attachment #1: Type: text/plain, Size: 393 bytes --]

Chris Boot wrote:
> Make the next48xx LED code use scx200_gpio_ops instead of raw SCx200 
> GPIO accesses.
> 
> Signed-off-by: Chris Boot <bootc@bootc.net>
> 
> ---
> 
> Resending since I forgot the subject in the last message! Oops!

Resending *again* because Thunderbird eats patches and I keep forgetting! 
Anybody have a fix for this?

-- 
Chris Boot
bootc@bootc.net
http://www.bootc.net/

[-- Attachment #2: net48xx-led-use-gpio-ops.patch --]
[-- Type: text/x-patch, Size: 989 bytes --]

diff --git a/drivers/leds/leds-net48xx.c b/drivers/leds/leds-net48xx.c
index 713c4a8..45ba3d4 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;
 	}