gpio: xgene: 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: Feng Kan <fkan@apm.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
765aa58778
commit
ac9dc85eea
|
@ -47,14 +47,9 @@ struct xgene_gpio {
|
|||
#endif
|
||||
};
|
||||
|
||||
static inline struct xgene_gpio *to_xgene_gpio(struct gpio_chip *chip)
|
||||
{
|
||||
return container_of(chip, struct xgene_gpio, chip);
|
||||
}
|
||||
|
||||
static int xgene_gpio_get(struct gpio_chip *gc, unsigned int offset)
|
||||
{
|
||||
struct xgene_gpio *chip = to_xgene_gpio(gc);
|
||||
struct xgene_gpio *chip = gpiochip_get_data(gc);
|
||||
unsigned long bank_offset;
|
||||
u32 bit_offset;
|
||||
|
||||
|
@ -65,7 +60,7 @@ static int xgene_gpio_get(struct gpio_chip *gc, unsigned int offset)
|
|||
|
||||
static void __xgene_gpio_set(struct gpio_chip *gc, unsigned int offset, int val)
|
||||
{
|
||||
struct xgene_gpio *chip = to_xgene_gpio(gc);
|
||||
struct xgene_gpio *chip = gpiochip_get_data(gc);
|
||||
unsigned long bank_offset;
|
||||
u32 setval, bit_offset;
|
||||
|
||||
|
@ -82,7 +77,7 @@ static void __xgene_gpio_set(struct gpio_chip *gc, unsigned int offset, int val)
|
|||
|
||||
static void xgene_gpio_set(struct gpio_chip *gc, unsigned int offset, int val)
|
||||
{
|
||||
struct xgene_gpio *chip = to_xgene_gpio(gc);
|
||||
struct xgene_gpio *chip = gpiochip_get_data(gc);
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&chip->lock, flags);
|
||||
|
@ -92,7 +87,7 @@ static void xgene_gpio_set(struct gpio_chip *gc, unsigned int offset, int val)
|
|||
|
||||
static int xgene_gpio_dir_in(struct gpio_chip *gc, unsigned int offset)
|
||||
{
|
||||
struct xgene_gpio *chip = to_xgene_gpio(gc);
|
||||
struct xgene_gpio *chip = gpiochip_get_data(gc);
|
||||
unsigned long flags, bank_offset;
|
||||
u32 dirval, bit_offset;
|
||||
|
||||
|
@ -113,7 +108,7 @@ static int xgene_gpio_dir_in(struct gpio_chip *gc, unsigned int offset)
|
|||
static int xgene_gpio_dir_out(struct gpio_chip *gc,
|
||||
unsigned int offset, int val)
|
||||
{
|
||||
struct xgene_gpio *chip = to_xgene_gpio(gc);
|
||||
struct xgene_gpio *chip = gpiochip_get_data(gc);
|
||||
unsigned long flags, bank_offset;
|
||||
u32 dirval, bit_offset;
|
||||
|
||||
|
@ -198,7 +193,7 @@ static int xgene_gpio_probe(struct platform_device *pdev)
|
|||
|
||||
platform_set_drvdata(pdev, gpio);
|
||||
|
||||
err = gpiochip_add(&gpio->chip);
|
||||
err = gpiochip_add_data(&gpio->chip, gpio);
|
||||
if (err) {
|
||||
dev_err(&pdev->dev,
|
||||
"failed to register gpiochip.\n");
|
||||
|
|
Loading…
Reference in New Issue