The patch titled
Make net48xx-led use scx200_gpio_ops
has been added to the -mm tree. Its filename is
make-net48xx-led-use-scx200_gpio_ops.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Make net48xx-led use scx200_gpio_ops
From: Chris Boot <bootc@xxxxxxxxx>
Make the next48xx LED code use scx200_gpio_ops instead of raw SCx200 GPIO
accesses.
Signed-off-by: Chris Boot <bootc@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/leds/leds-net48xx.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff -puN drivers/leds/leds-net48xx.c~make-net48xx-led-use-scx200_gpio_ops drivers/leds/leds-net48xx.c
--- a/drivers/leds/leds-net48xx.c~make-net48xx-led-use-scx200_gpio_ops
+++ a/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;
}
_
Patches currently in -mm which might be from bootc@xxxxxxxxx are
scx200_gpio-export-cleanups.patch
make-net48xx-led-use-scx200_gpio_ops.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
