system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

gpio: amd8111: use gpiochip data pointer

Browse source 
This makes the driver use the data pointer added to the gpio_chip
to store a pointer to the state container instead of relying on
container_of().

Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-12-04 15:26:35 +01:00
parent 397d0773a9
commit 57683ec203
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/gpio/gpio-amd8111.c
View file

@ -75,11 +75,9 @@ struct amd_gpio {
u8 orig[32]; u8 orig[32];
}; };
#define to_agp(chip) container_of(chip, struct amd_gpio, chip)
static int amd_gpio_request(struct gpio_chip *chip, unsigned offset) static int amd_gpio_request(struct gpio_chip *chip, unsigned offset)
{ {
struct amd_gpio *agp = to_agp(chip); struct amd_gpio *agp = gpiochip_get_data(chip);
agp->orig[offset] = ioread8(agp->pm + AMD_REG_GPIO(offset)) & agp->orig[offset] = ioread8(agp->pm + AMD_REG_GPIO(offset)) &
(AMD_GPIO_DEBOUNCE | AMD_GPIO_MODE_MASK | AMD_GPIO_X_MASK); (AMD_GPIO_DEBOUNCE | AMD_GPIO_MODE_MASK | AMD_GPIO_X_MASK);
@ -91,7 +89,7 @@ static int amd_gpio_request(struct gpio_chip *chip, unsigned offset)
static void amd_gpio_free(struct gpio_chip *chip, unsigned offset) static void amd_gpio_free(struct gpio_chip *chip, unsigned offset)
{ {
struct amd_gpio *agp = to_agp(chip); struct amd_gpio *agp = gpiochip_get_data(chip);
dev_dbg(&agp->pdev->dev, "Freed gpio %d, data %x\n", offset, agp->orig[offset]); dev_dbg(&agp->pdev->dev, "Freed gpio %d, data %x\n", offset, agp->orig[offset]);
@ -100,7 +98,7 @@ static void amd_gpio_free(struct gpio_chip *chip, unsigned offset)
static void amd_gpio_set(struct gpio_chip *chip, unsigned offset, int value) static void amd_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
{ {
struct amd_gpio *agp = to_agp(chip); struct amd_gpio *agp = gpiochip_get_data(chip);
u8 temp; u8 temp;
unsigned long flags; unsigned long flags;
@ -115,7 +113,7 @@ static void amd_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
static int amd_gpio_get(struct gpio_chip *chip, unsigned offset) static int amd_gpio_get(struct gpio_chip *chip, unsigned offset)
{ {
struct amd_gpio *agp = to_agp(chip); struct amd_gpio *agp = gpiochip_get_data(chip);
u8 temp; u8 temp;
temp = ioread8(agp->pm + AMD_REG_GPIO(offset)); temp = ioread8(agp->pm + AMD_REG_GPIO(offset));
@ -127,7 +125,7 @@ static int amd_gpio_get(struct gpio_chip *chip, unsigned offset)
static int amd_gpio_dirout(struct gpio_chip *chip, unsigned offset, int value) static int amd_gpio_dirout(struct gpio_chip *chip, unsigned offset, int value)
{ {
struct amd_gpio *agp = to_agp(chip); struct amd_gpio *agp = gpiochip_get_data(chip);
u8 temp; u8 temp;
unsigned long flags; unsigned long flags;
@ -144,7 +142,7 @@ static int amd_gpio_dirout(struct gpio_chip *chip, unsigned offset, int value)
static int amd_gpio_dirin(struct gpio_chip *chip, unsigned offset) static int amd_gpio_dirin(struct gpio_chip *chip, unsigned offset)
{ {
struct amd_gpio *agp = to_agp(chip); struct amd_gpio *agp = gpiochip_get_data(chip);
u8 temp; u8 temp;
unsigned long flags; unsigned long flags;
@ -225,7 +223,7 @@ static int __init amd_gpio_init(void)
spin_lock_init(&gp.lock); spin_lock_init(&gp.lock);
printk(KERN_INFO "AMD-8111 GPIO detected\n"); printk(KERN_INFO "AMD-8111 GPIO detected\n");
err = gpiochip_add(&gp.chip); err = gpiochip_add_data(&gp.chip, &gp);
if (err) { if (err) {
printk(KERN_ERR "GPIO registering failed (%d)\n", printk(KERN_ERR "GPIO registering failed (%d)\n",
err); err);