Commit 6e0171b4 authored by William Breathitt Gray's avatar William Breathitt Gray Committed by Linus Walleij

gpio: 104-idio-16: Use lowercase symbol names for const variables

To prevent confusion, and to match the existing coding style used in
other GPIO drivers, symbol names within the 104-idio-16 GPIO driver
should be lowercase.
Signed-off-by: default avatarWilliam Breathitt Gray <vilhelm.gray@gmail.com>
Reviewed-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 5ed41cc4
...@@ -80,21 +80,21 @@ static struct idio_16_gpio *to_idio16gpio(struct gpio_chip *gc) ...@@ -80,21 +80,21 @@ static struct idio_16_gpio *to_idio16gpio(struct gpio_chip *gc)
static int idio_16_gpio_get(struct gpio_chip *chip, unsigned offset) static int idio_16_gpio_get(struct gpio_chip *chip, unsigned offset)
{ {
struct idio_16_gpio *const idio16gpio = to_idio16gpio(chip); struct idio_16_gpio *const idio16gpio = to_idio16gpio(chip);
const unsigned BIT_MASK = 1U << (offset-16); const unsigned mask = BIT(offset-16);
if (offset < 16) if (offset < 16)
return -EINVAL; return -EINVAL;
if (offset < 24) if (offset < 24)
return !!(inb(idio16gpio->base + 1) & BIT_MASK); return !!(inb(idio16gpio->base + 1) & mask);
return !!(inb(idio16gpio->base + 5) & (BIT_MASK>>8)); return !!(inb(idio16gpio->base + 5) & (mask>>8));
} }
static void idio_16_gpio_set(struct gpio_chip *chip, unsigned offset, int value) static void idio_16_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
{ {
struct idio_16_gpio *const idio16gpio = to_idio16gpio(chip); struct idio_16_gpio *const idio16gpio = to_idio16gpio(chip);
const unsigned BIT_MASK = 1U << offset; const unsigned mask = BIT(offset);
unsigned long flags; unsigned long flags;
if (offset > 15) if (offset > 15)
...@@ -103,9 +103,9 @@ static void idio_16_gpio_set(struct gpio_chip *chip, unsigned offset, int value) ...@@ -103,9 +103,9 @@ static void idio_16_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
spin_lock_irqsave(&idio16gpio->lock, flags); spin_lock_irqsave(&idio16gpio->lock, flags);
if (value) if (value)
idio16gpio->out_state |= BIT_MASK; idio16gpio->out_state |= mask;
else else
idio16gpio->out_state &= ~BIT_MASK; idio16gpio->out_state &= ~mask;
if (offset > 7) if (offset > 7)
outb(idio16gpio->out_state >> 8, idio16gpio->base + 4); outb(idio16gpio->out_state >> 8, idio16gpio->base + 4);
...@@ -200,25 +200,24 @@ static int __init idio_16_probe(struct platform_device *pdev) ...@@ -200,25 +200,24 @@ static int __init idio_16_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct idio_16_gpio *idio16gpio; struct idio_16_gpio *idio16gpio;
const unsigned base = idio_16_base;
const unsigned extent = 8;
const char *const name = dev_name(dev);
int err; int err;
const unsigned irq = idio_16_irq;
const unsigned BASE = idio_16_base;
const unsigned EXTENT = 8;
const unsigned IRQ = idio_16_irq;
const char *const NAME = dev_name(dev);
idio16gpio = devm_kzalloc(dev, sizeof(*idio16gpio), GFP_KERNEL); idio16gpio = devm_kzalloc(dev, sizeof(*idio16gpio), GFP_KERNEL);
if (!idio16gpio) if (!idio16gpio)
return -ENOMEM; return -ENOMEM;
if (!request_region(BASE, EXTENT, NAME)) { if (!request_region(base, extent, name)) {
dev_err(dev, "Unable to lock %s port addresses (0x%X-0x%X)\n", dev_err(dev, "Unable to lock %s port addresses (0x%X-0x%X)\n",
NAME, BASE, BASE + EXTENT); name, base, base + extent);
err = -EBUSY; err = -EBUSY;
goto err_lock_io_port; goto err_lock_io_port;
} }
idio16gpio->chip.label = NAME; idio16gpio->chip.label = name;
idio16gpio->chip.parent = dev; idio16gpio->chip.parent = dev;
idio16gpio->chip.owner = THIS_MODULE; idio16gpio->chip.owner = THIS_MODULE;
idio16gpio->chip.base = -1; idio16gpio->chip.base = -1;
...@@ -228,9 +227,9 @@ static int __init idio_16_probe(struct platform_device *pdev) ...@@ -228,9 +227,9 @@ static int __init idio_16_probe(struct platform_device *pdev)
idio16gpio->chip.direction_output = idio_16_gpio_direction_output; idio16gpio->chip.direction_output = idio_16_gpio_direction_output;
idio16gpio->chip.get = idio_16_gpio_get; idio16gpio->chip.get = idio_16_gpio_get;
idio16gpio->chip.set = idio_16_gpio_set; idio16gpio->chip.set = idio_16_gpio_set;
idio16gpio->base = BASE; idio16gpio->base = base;
idio16gpio->extent = EXTENT; idio16gpio->extent = extent;
idio16gpio->irq = IRQ; idio16gpio->irq = irq;
idio16gpio->out_state = 0xFFFF; idio16gpio->out_state = 0xFFFF;
spin_lock_init(&idio16gpio->lock); spin_lock_init(&idio16gpio->lock);
...@@ -250,7 +249,7 @@ static int __init idio_16_probe(struct platform_device *pdev) ...@@ -250,7 +249,7 @@ static int __init idio_16_probe(struct platform_device *pdev)
goto err_gpiochip_irqchip_add; goto err_gpiochip_irqchip_add;
} }
err = request_irq(IRQ, idio_16_irq_handler, 0, NAME, idio16gpio); err = request_irq(irq, idio_16_irq_handler, 0, name, idio16gpio);
if (err) { if (err) {
dev_err(dev, "IRQ handler registering failed (%d)\n", err); dev_err(dev, "IRQ handler registering failed (%d)\n", err);
goto err_request_irq; goto err_request_irq;
...@@ -262,7 +261,7 @@ static int __init idio_16_probe(struct platform_device *pdev) ...@@ -262,7 +261,7 @@ static int __init idio_16_probe(struct platform_device *pdev)
err_gpiochip_irqchip_add: err_gpiochip_irqchip_add:
gpiochip_remove(&idio16gpio->chip); gpiochip_remove(&idio16gpio->chip);
err_gpio_register: err_gpio_register:
release_region(BASE, EXTENT); release_region(base, extent);
err_lock_io_port: err_lock_io_port:
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment