lkml.org 
[lkml]   [2015]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 13/23] gpio: sysfs: remove redundant gpio-descriptor parameters
Date
Remove redundant gpio-descriptor parameters from sysfs_set_active_low and
gpio_setup_irq.

Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/gpio/gpiolib-sysfs.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c
index 4cc90f7ce14b..bc4f192c0aa3 100644
--- a/drivers/gpio/gpiolib-sysfs.c
+++ b/drivers/gpio/gpiolib-sysfs.c
@@ -133,9 +133,10 @@ static irqreturn_t gpio_sysfs_irq(int irq, void *priv)
return IRQ_HANDLED;
}

-static int gpio_setup_irq(struct gpio_desc *desc, struct device *dev,
- unsigned long gpio_flags)
+static int gpio_setup_irq(struct device *dev, unsigned long gpio_flags)
{
+ struct gpiod_data *data = dev_get_drvdata(dev);
+ struct gpio_desc *desc = data->desc;
struct kernfs_node *value_sd;
unsigned long irq_flags;
int ret, irq, id;
@@ -242,8 +243,6 @@ static ssize_t edge_show(struct device *dev,
static ssize_t edge_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t size)
{
- struct gpiod_data *data = dev_get_drvdata(dev);
- struct gpio_desc *desc = data->desc;
ssize_t status;
int i;

@@ -255,7 +254,7 @@ static ssize_t edge_store(struct device *dev,
found:
mutex_lock(&sysfs_lock);

- status = gpio_setup_irq(desc, dev, trigger_types[i].flags);
+ status = gpio_setup_irq(dev, trigger_types[i].flags);
if (!status)
status = size;

@@ -265,9 +264,10 @@ found:
}
static DEVICE_ATTR_RW(edge);

-static int sysfs_set_active_low(struct gpio_desc *desc, struct device *dev,
- int value)
+static int sysfs_set_active_low(struct device *dev, int value)
{
+ struct gpiod_data *data = dev_get_drvdata(dev);
+ struct gpio_desc *desc = data->desc;
int status = 0;

if (!!test_bit(FLAG_ACTIVE_LOW, &desc->flags) == !!value)
@@ -283,8 +283,8 @@ static int sysfs_set_active_low(struct gpio_desc *desc, struct device *dev,
!!test_bit(FLAG_TRIG_FALL, &desc->flags)) {
unsigned long trigger_flags = desc->flags & GPIO_TRIGGER_MASK;

- gpio_setup_irq(desc, dev, 0);
- status = gpio_setup_irq(desc, dev, trigger_flags);
+ gpio_setup_irq(dev, 0);
+ status = gpio_setup_irq(dev, trigger_flags);
}

return status;
@@ -310,8 +310,6 @@ static ssize_t active_low_show(struct device *dev,
static ssize_t active_low_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t size)
{
- struct gpiod_data *data = dev_get_drvdata(dev);
- struct gpio_desc *desc = data->desc;
ssize_t status;
long value;

@@ -319,7 +317,7 @@ static ssize_t active_low_store(struct device *dev,

status = kstrtol(buf, 0, &value);
if (status == 0)
- status = sysfs_set_active_low(desc, dev, value != 0);
+ status = sysfs_set_active_low(dev, value != 0);

mutex_unlock(&sysfs_lock);

@@ -695,7 +693,7 @@ void gpiod_unexport(struct gpio_desc *desc)
* Release irq after deregistration to prevent race with
* edge_store.
*/
- gpio_setup_irq(desc, dev, 0);
+ gpio_setup_irq(dev, 0);
put_device(dev);
kfree(data);
}
--
2.0.5


\
 
 \ /
  Last update: 2015-04-21 18:01    [W:0.187 / U:10.820 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site