openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

gpio: sx150x: use gpiochip data pointer 

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: Wei Chen <Wei.Chen@csr.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-12-07 14:36:31 +01:00
parent c63b30b089
commit 5b90b8c217
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/gpio/gpio-sx150x.c
View File

@ -194,11 +194,6 @@ static const struct of_device_id sx150x_of_match[] = {
}; };
MODULE_DEVICE_TABLE(of, sx150x_of_match); MODULE_DEVICE_TABLE(of, sx150x_of_match);
struct sx150x_chip *to_sx150x(struct gpio_chip *gc)
{
return container_of(gc, struct sx150x_chip, gpio_chip);
}
static s32 sx150x_i2c_write(struct i2c_client *client, u8 reg, u8 val) static s32 sx150x_i2c_write(struct i2c_client *client, u8 reg, u8 val)
{ {
s32 err = i2c_smbus_write_byte_data(client, reg, val); s32 err = i2c_smbus_write_byte_data(client, reg, val);
@ -335,7 +330,7 @@ static int sx150x_io_output(struct sx150x_chip *chip, unsigned offset, int val)
static int sx150x_gpio_get(struct gpio_chip *gc, unsigned offset) static int sx150x_gpio_get(struct gpio_chip *gc, unsigned offset)
{ {
struct sx150x_chip *chip = to_sx150x(gc); struct sx150x_chip *chip = gpiochip_get_data(gc);
int status = -EINVAL; int status = -EINVAL;
if (!offset_is_oscio(chip, offset)) { if (!offset_is_oscio(chip, offset)) {
@ -349,7 +344,7 @@ static int sx150x_gpio_get(struct gpio_chip *gc, unsigned offset)
static void sx150x_gpio_set(struct gpio_chip *gc, unsigned offset, int val) static void sx150x_gpio_set(struct gpio_chip *gc, unsigned offset, int val)
{ {
struct sx150x_chip *chip = to_sx150x(gc); struct sx150x_chip *chip = gpiochip_get_data(gc);
mutex_lock(&chip->lock); mutex_lock(&chip->lock);
if (offset_is_oscio(chip, offset)) if (offset_is_oscio(chip, offset))
@ -361,7 +356,7 @@ static void sx150x_gpio_set(struct gpio_chip *gc, unsigned offset, int val)
static int sx150x_gpio_direction_input(struct gpio_chip *gc, unsigned offset) static int sx150x_gpio_direction_input(struct gpio_chip *gc, unsigned offset)
{ {
struct sx150x_chip *chip = to_sx150x(gc); struct sx150x_chip *chip = gpiochip_get_data(gc);
int status = -EINVAL; int status = -EINVAL;
if (!offset_is_oscio(chip, offset)) { if (!offset_is_oscio(chip, offset)) {
@ -376,7 +371,7 @@ static int sx150x_gpio_direction_output(struct gpio_chip *gc,
unsigned offset, unsigned offset,
int val) int val)
{ {
struct sx150x_chip *chip = to_sx150x(gc); struct sx150x_chip *chip = gpiochip_get_data(gc);
int status = 0; int status = 0;
if (!offset_is_oscio(chip, offset)) { if (!offset_is_oscio(chip, offset)) {
@ -389,7 +384,7 @@ static int sx150x_gpio_direction_output(struct gpio_chip *gc,
static void sx150x_irq_mask(struct irq_data *d) static void sx150x_irq_mask(struct irq_data *d)
{ {
struct sx150x_chip *chip = to_sx150x(irq_data_get_irq_chip_data(d)); struct sx150x_chip *chip = gpiochip_get_data(irq_data_get_irq_chip_data(d));
unsigned n = d->hwirq; unsigned n = d->hwirq;
chip->irq_masked |= (1 << n); chip->irq_masked |= (1 << n);
@ -398,7 +393,7 @@ static void sx150x_irq_mask(struct irq_data *d)
static void sx150x_irq_unmask(struct irq_data *d) static void sx150x_irq_unmask(struct irq_data *d)
{ {
struct sx150x_chip *chip = to_sx150x(irq_data_get_irq_chip_data(d)); struct sx150x_chip *chip = gpiochip_get_data(irq_data_get_irq_chip_data(d));
unsigned n = d->hwirq; unsigned n = d->hwirq;
chip->irq_masked &= ~(1 << n); chip->irq_masked &= ~(1 << n);
@ -407,7 +402,7 @@ static void sx150x_irq_unmask(struct irq_data *d)
static int sx150x_irq_set_type(struct irq_data *d, unsigned int flow_type) static int sx150x_irq_set_type(struct irq_data *d, unsigned int flow_type)
{ {
struct sx150x_chip *chip = to_sx150x(irq_data_get_irq_chip_data(d)); struct sx150x_chip *chip = gpiochip_get_data(irq_data_get_irq_chip_data(d));
unsigned n, val = 0; unsigned n, val = 0;
if (flow_type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) if (flow_type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))
@ -462,14 +457,14 @@ static irqreturn_t sx150x_irq_thread_fn(int irq, void *dev_id)
static void sx150x_irq_bus_lock(struct irq_data *d) static void sx150x_irq_bus_lock(struct irq_data *d)
{ {
struct sx150x_chip *chip = to_sx150x(irq_data_get_irq_chip_data(d)); struct sx150x_chip *chip = gpiochip_get_data(irq_data_get_irq_chip_data(d));
mutex_lock(&chip->lock); mutex_lock(&chip->lock);
} }
static void sx150x_irq_bus_sync_unlock(struct irq_data *d) static void sx150x_irq_bus_sync_unlock(struct irq_data *d)
{ {
struct sx150x_chip *chip = to_sx150x(irq_data_get_irq_chip_data(d)); struct sx150x_chip *chip = gpiochip_get_data(irq_data_get_irq_chip_data(d));
unsigned n; unsigned n;
if (chip->irq_update == NO_UPDATE_PENDING) if (chip->irq_update == NO_UPDATE_PENDING)
@ -692,7 +687,7 @@ static int sx150x_probe(struct i2c_client *client,
if (rc < 0) if (rc < 0)
return rc; return rc;
rc = gpiochip_add(&chip->gpio_chip); rc = gpiochip_add_data(&chip->gpio_chip, chip);
if (rc) if (rc)
return rc; return rc;