| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 17 Nov 2011 22:47:29 +0200
From: Denis Kuzmenko <linux@...onet.org.ua>
To: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Grant Likely <grant.likely@...retlab.ca>,
Linus Walleij <linus.walleij@...aro.org>,
Richard Purdie <rpurdie@...ys.net>
CC: Stephen Warren <swarren@...dia.com>,
Wolfram Sang <w.sang@...gutronix.de>
Subject: [PATCH] s3c/s3c24xx: arm: leds: Make s3c24xx LEDS driver use gpiolib
Make s3c24xx LEDS driver use gpiolib.
Signed-off-by: Denis Kuzmenko <linux@...onet.org.ua>
---
Patch is against 3.0.9
Tested on Mini2440 board which implements most complex case where both
S3C24XX_LEDF_ACTLOW and S3C24XX_LEDF_TRISTATE are set
diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c
index a77771d..b36f123 100644
--- a/drivers/leds/leds-s3c24xx.c
+++ b/drivers/leds/leds-s3c24xx.c
@@ -40,28 +40,40 @@ static inline struct s3c24xx_gpio_led
*to_gpio(struct led_classdev *led_cdev)
}
static void s3c24xx_led_set(struct led_classdev *led_cdev,
- enum led_brightness value)
+ enum led_brightness value)
{
struct s3c24xx_gpio_led *led = to_gpio(led_cdev);
struct s3c24xx_led_platdata *pd = led->pdata;
- /* there will be a short delay between setting the output and
- * going from output to input when using tristate. */
-
- s3c2410_gpio_setpin(pd->gpio, (value ? 1 : 0) ^
- (pd->flags & S3C24XX_LEDF_ACTLOW));
-
- if (pd->flags & S3C24XX_LEDF_TRISTATE)
- s3c2410_gpio_cfgpin(pd->gpio,
- value ? S3C2410_GPIO_OUTPUT : S3C2410_GPIO_INPUT);
+ /*
+ * ensure value is 0 or 1 to use it with bitwise XOR (^)
+ * (only 100% brightness is supported)
+ */
+ value = value ? 1 : 0;
+
+ if (pd->flags & S3C24XX_LEDF_TRISTATE) {
+ if (value) {
+ /* invert value if S3C24XX_LEDF_ACTLOW is set */
+ value = (pd->flags & S3C24XX_LEDF_ACTLOW) ^ value;
+ gpio_direction_output(pd->gpio, value);
+ } else {
+ gpio_direction_input(pd->gpio);
+ }
+ } else {
+ /* invert value if S3C24XX_LEDF_ACTLOW is set */
+ value = (pd->flags & S3C24XX_LEDF_ACTLOW) ^ value;
+ gpio_set_value(pd->gpio, value);
+ }
}
static int s3c24xx_led_remove(struct platform_device *dev)
{
+ struct s3c24xx_led_platdata *pdata = dev->dev.platform_data;
struct s3c24xx_gpio_led *led = pdev_to_gpio(dev);
led_classdev_unregister(&led->cdev);
+ gpio_free(pdata->gpio);
kfree(led);
return 0;
@@ -76,7 +88,8 @@ static int s3c24xx_led_probe(struct platform_device *dev)
led = kzalloc(sizeof(struct s3c24xx_gpio_led), GFP_KERNEL);
if (led == NULL) {
dev_err(&dev->dev, "No memory for device\n");
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_kzalloc;
}
platform_set_drvdata(dev, led);
@@ -91,12 +104,15 @@ static int s3c24xx_led_probe(struct platform_device
*dev)
/* no point in having a pull-up if we are always driving */
if (pdata->flags & S3C24XX_LEDF_TRISTATE) {
- s3c2410_gpio_setpin(pdata->gpio, 0);
- s3c2410_gpio_cfgpin(pdata->gpio, S3C2410_GPIO_INPUT);
+ ret = gpio_request_one(pdata->gpio, GPIOF_IN, pdata->name);
} else {
- s3c2410_gpio_pullup(pdata->gpio, 0);
- s3c2410_gpio_setpin(pdata->gpio, 0);
- s3c2410_gpio_cfgpin(pdata->gpio, S3C2410_GPIO_OUTPUT);
+ ret = gpio_request_one(pdata->gpio, GPIOF_OUT_INIT_LOW,
+ pdata->name);
+ s3c_gpio_setpull(pdata->gpio, S3C_GPIO_PULL_NONE);
+ }
+ if (ret < 0) {
+ dev_err(&dev->dev, "gpio_request failed\n");
+ goto err_gpio_request;
}
/* register our new led device */
@@ -104,11 +120,17 @@ static int s3c24xx_led_probe(struct
platform_device *dev)
ret = led_classdev_register(&dev->dev, &led->cdev);
if (ret < 0) {
dev_err(&dev->dev, "led_classdev_register failed\n");
- kfree(led);
- return ret;
+ goto err_led_classdev_register;
}
return 0;
+
+err_led_classdev_register:
+ gpio_free(pdata->gpio);
+err_gpio_request:
+ kfree(led);
+err_kzalloc:
+ return ret;
}
static struct platform_driver s3c24xx_led_driver = {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists