leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpio: pl061: rename state container struct

Browse Source 
The PL061 state container is named "pl061_gpio", let's rename it
to simply pl061. Less is more.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2016-11-25 10:43:15 +01:00
parent 9c18be8e93
commit 538f76c566
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/gpio/gpio-pl061.c
View File

@ -50,7 +50,7 @@ struct pl061_context_save_regs {
}; };
#endif #endif
struct pl061_gpio { struct pl061 {
spinlock_t lock; spinlock_t lock;
void __iomem *base; void __iomem *base;
@ -64,14 +64,14 @@ struct pl061_gpio {
static int pl061_get_direction(struct gpio_chip *gc, unsigned offset) static int pl061_get_direction(struct gpio_chip *gc, unsigned offset)
{ {
struct pl061_gpio *chip = gpiochip_get_data(gc); struct pl061 *chip = gpiochip_get_data(gc);
return !(readb(chip->base + GPIODIR) & BIT(offset)); return !(readb(chip->base + GPIODIR) & BIT(offset));
} }
static int pl061_direction_input(struct gpio_chip *gc, unsigned offset) static int pl061_direction_input(struct gpio_chip *gc, unsigned offset)
{ {
struct pl061_gpio *chip = gpiochip_get_data(gc); struct pl061 *chip = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
unsigned char gpiodir; unsigned char gpiodir;
@ -87,7 +87,7 @@ static int pl061_direction_input(struct gpio_chip *gc, unsigned offset)
static int pl061_direction_output(struct gpio_chip *gc, unsigned offset, static int pl061_direction_output(struct gpio_chip *gc, unsigned offset,
int value) int value)
{ {
struct pl061_gpio *chip = gpiochip_get_data(gc); struct pl061 *chip = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
unsigned char gpiodir; unsigned char gpiodir;
@ -109,14 +109,14 @@ static int pl061_direction_output(struct gpio_chip *gc, unsigned offset,
static int pl061_get_value(struct gpio_chip *gc, unsigned offset) static int pl061_get_value(struct gpio_chip *gc, unsigned offset)
{ {
struct pl061_gpio *chip = gpiochip_get_data(gc); struct pl061 *chip = gpiochip_get_data(gc);
return !!readb(chip->base + (BIT(offset + 2))); return !!readb(chip->base + (BIT(offset + 2)));
} }
static void pl061_set_value(struct gpio_chip *gc, unsigned offset, int value) static void pl061_set_value(struct gpio_chip *gc, unsigned offset, int value)
{ {
struct pl061_gpio *chip = gpiochip_get_data(gc); struct pl061 *chip = gpiochip_get_data(gc);
writeb(!!value << offset, chip->base + (BIT(offset + 2))); writeb(!!value << offset, chip->base + (BIT(offset + 2)));
} }
@ -124,7 +124,7 @@ static void pl061_set_value(struct gpio_chip *gc, unsigned offset, int value)
static int pl061_irq_type(struct irq_data *d, unsigned trigger) static int pl061_irq_type(struct irq_data *d, unsigned trigger)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct pl061_gpio *chip = gpiochip_get_data(gc); struct pl061 *chip = gpiochip_get_data(gc);
int offset = irqd_to_hwirq(d); int offset = irqd_to_hwirq(d);
unsigned long flags; unsigned long flags;
u8 gpiois, gpioibe, gpioiev; u8 gpiois, gpioibe, gpioiev;
@ -214,7 +214,7 @@ static void pl061_irq_handler(struct irq_desc *desc)
unsigned long pending; unsigned long pending;
int offset; int offset;
struct gpio_chip *gc = irq_desc_get_handler_data(desc); struct gpio_chip *gc = irq_desc_get_handler_data(desc);
struct pl061_gpio *chip = gpiochip_get_data(gc); struct pl061 *chip = gpiochip_get_data(gc);
struct irq_chip *irqchip = irq_desc_get_chip(desc); struct irq_chip *irqchip = irq_desc_get_chip(desc);
chained_irq_enter(irqchip, desc); chained_irq_enter(irqchip, desc);
@ -232,7 +232,7 @@ static void pl061_irq_handler(struct irq_desc *desc)
static void pl061_irq_mask(struct irq_data *d) static void pl061_irq_mask(struct irq_data *d)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct pl061_gpio *chip = gpiochip_get_data(gc); struct pl061 *chip = gpiochip_get_data(gc);
u8 mask = BIT(irqd_to_hwirq(d) % PL061_GPIO_NR); u8 mask = BIT(irqd_to_hwirq(d) % PL061_GPIO_NR);
u8 gpioie; u8 gpioie;
@ -245,7 +245,7 @@ static void pl061_irq_mask(struct irq_data *d)
static void pl061_irq_unmask(struct irq_data *d) static void pl061_irq_unmask(struct irq_data *d)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct pl061_gpio *chip = gpiochip_get_data(gc); struct pl061 *chip = gpiochip_get_data(gc);
u8 mask = BIT(irqd_to_hwirq(d) % PL061_GPIO_NR); u8 mask = BIT(irqd_to_hwirq(d) % PL061_GPIO_NR);
u8 gpioie; u8 gpioie;
@ -266,7 +266,7 @@ static void pl061_irq_unmask(struct irq_data *d)
static void pl061_irq_ack(struct irq_data *d) static void pl061_irq_ack(struct irq_data *d)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct pl061_gpio *chip = gpiochip_get_data(gc); struct pl061 *chip = gpiochip_get_data(gc);
u8 mask = BIT(irqd_to_hwirq(d) % PL061_GPIO_NR); u8 mask = BIT(irqd_to_hwirq(d) % PL061_GPIO_NR);
spin_lock(&chip->lock); spin_lock(&chip->lock);
@ -277,7 +277,7 @@ static void pl061_irq_ack(struct irq_data *d)
static int pl061_irq_set_wake(struct irq_data *d, unsigned int state) static int pl061_irq_set_wake(struct irq_data *d, unsigned int state)
{ {
struct gpio_chip *gc = irq_data_get_irq_chip_data(d); struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
struct pl061_gpio *chip = gpiochip_get_data(gc); struct pl061 *chip = gpiochip_get_data(gc);
return irq_set_irq_wake(chip->parent_irq, state); return irq_set_irq_wake(chip->parent_irq, state);
} }
@ -295,7 +295,7 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id)
{ {
struct device *dev = &adev->dev; struct device *dev = &adev->dev;
struct pl061_platform_data *pdata = dev_get_platdata(dev); struct pl061_platform_data *pdata = dev_get_platdata(dev);
struct pl061_gpio *chip; struct pl061 *chip;
int ret, irq, i, irq_base; int ret, irq, i, irq_base;
chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL); chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL);
@ -379,7 +379,7 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int pl061_suspend(struct device *dev) static int pl061_suspend(struct device *dev)
{ {
struct pl061_gpio *chip = dev_get_drvdata(dev); struct pl061 *chip = dev_get_drvdata(dev);
int offset; int offset;
chip->csave_regs.gpio_data = 0; chip->csave_regs.gpio_data = 0;
@ -400,7 +400,7 @@ static int pl061_suspend(struct device *dev)
static int pl061_resume(struct device *dev) static int pl061_resume(struct device *dev)
{ {
struct pl061_gpio *chip = dev_get_drvdata(dev); struct pl061 *chip = dev_get_drvdata(dev);
int offset; int offset;
for (offset = 0; offset < PL061_GPIO_NR; offset++) { for (offset = 0; offset < PL061_GPIO_NR; offset++) {