xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpio: it87: 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: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij
2015-12-07 09:03:09 +01:00
parent 5c77c0212b
commit 0a38fd94c2
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/gpio/gpio-it87.c
View File

@@ -77,11 +77,6 @@ static struct it87_gpio it87_gpio_chip = {
.lock = __SPIN_LOCK_UNLOCKED(it87_gpio_chip.lock), .lock = __SPIN_LOCK_UNLOCKED(it87_gpio_chip.lock),
}; };
static inline struct it87_gpio *to_it87_gpio(struct gpio_chip *chip)
{
return container_of(chip, struct it87_gpio, chip);
}
/* Superio chip access functions; copied from wdt_it87 */ /* Superio chip access functions; copied from wdt_it87 */
static inline int superio_enter(void) static inline int superio_enter(void)
@@ -165,7 +160,7 @@ static int it87_gpio_request(struct gpio_chip *chip, unsigned gpio_num)
{ {
u8 mask, group; u8 mask, group;
int rc = 0; int rc = 0;
struct it87_gpio *it87_gpio = to_it87_gpio(chip); struct it87_gpio *it87_gpio = gpiochip_get_data(chip);
mask = 1 << (gpio_num % 8); mask = 1 << (gpio_num % 8);
group = (gpio_num / 8); group = (gpio_num / 8);
@@ -198,7 +193,7 @@ static int it87_gpio_get(struct gpio_chip *chip, unsigned gpio_num)
{ {
u16 reg; u16 reg;
u8 mask; u8 mask;
struct it87_gpio *it87_gpio = to_it87_gpio(chip); struct it87_gpio *it87_gpio = gpiochip_get_data(chip);
mask = 1 << (gpio_num % 8); mask = 1 << (gpio_num % 8);
reg = (gpio_num / 8) + it87_gpio->io_base; reg = (gpio_num / 8) + it87_gpio->io_base;
@@ -210,7 +205,7 @@ static int it87_gpio_direction_in(struct gpio_chip *chip, unsigned gpio_num)
{ {
u8 mask, group; u8 mask, group;
int rc = 0; int rc = 0;
struct it87_gpio *it87_gpio = to_it87_gpio(chip); struct it87_gpio *it87_gpio = gpiochip_get_data(chip);
mask = 1 << (gpio_num % 8); mask = 1 << (gpio_num % 8);
group = (gpio_num / 8); group = (gpio_num / 8);
@@ -236,7 +231,7 @@ static void it87_gpio_set(struct gpio_chip *chip,
{ {
u8 mask, curr_vals; u8 mask, curr_vals;
u16 reg; u16 reg;
struct it87_gpio *it87_gpio = to_it87_gpio(chip); struct it87_gpio *it87_gpio = gpiochip_get_data(chip);
mask = 1 << (gpio_num % 8); mask = 1 << (gpio_num % 8);
reg = (gpio_num / 8) + it87_gpio->io_base; reg = (gpio_num / 8) + it87_gpio->io_base;
@@ -253,7 +248,7 @@ static int it87_gpio_direction_out(struct gpio_chip *chip,
{ {
u8 mask, group; u8 mask, group;
int rc = 0; int rc = 0;
struct it87_gpio *it87_gpio = to_it87_gpio(chip); struct it87_gpio *it87_gpio = gpiochip_get_data(chip);
mask = 1 << (gpio_num % 8); mask = 1 << (gpio_num % 8);
group = (gpio_num / 8); group = (gpio_num / 8);
@@ -380,7 +375,7 @@ static int __init it87_gpio_init(void)
it87_gpio->chip.names = (const char *const*)labels_table; it87_gpio->chip.names = (const char *const*)labels_table;
rc = gpiochip_add(&it87_gpio->chip); rc = gpiochip_add_data(&it87_gpio->chip, it87_gpio);
if (rc) if (rc)
goto labels_free; goto labels_free;