|
@@ -193,8 +193,7 @@ static struct f7188x_gpio_bank f71889_gpio_bank[] = {
|
|
|
static int f7188x_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
|
|
|
{
|
|
|
int err;
|
|
|
- struct f7188x_gpio_bank *bank =
|
|
|
- container_of(chip, struct f7188x_gpio_bank, chip);
|
|
|
+ struct f7188x_gpio_bank *bank = gpiochip_get_data(chip);
|
|
|
struct f7188x_sio *sio = bank->data->sio;
|
|
|
u8 dir;
|
|
|
|
|
@@ -215,8 +214,7 @@ static int f7188x_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
|
|
|
static int f7188x_gpio_get(struct gpio_chip *chip, unsigned offset)
|
|
|
{
|
|
|
int err;
|
|
|
- struct f7188x_gpio_bank *bank =
|
|
|
- container_of(chip, struct f7188x_gpio_bank, chip);
|
|
|
+ struct f7188x_gpio_bank *bank = gpiochip_get_data(chip);
|
|
|
struct f7188x_sio *sio = bank->data->sio;
|
|
|
u8 dir, data;
|
|
|
|
|
@@ -241,8 +239,7 @@ static int f7188x_gpio_direction_out(struct gpio_chip *chip,
|
|
|
unsigned offset, int value)
|
|
|
{
|
|
|
int err;
|
|
|
- struct f7188x_gpio_bank *bank =
|
|
|
- container_of(chip, struct f7188x_gpio_bank, chip);
|
|
|
+ struct f7188x_gpio_bank *bank = gpiochip_get_data(chip);
|
|
|
struct f7188x_sio *sio = bank->data->sio;
|
|
|
u8 dir, data_out;
|
|
|
|
|
@@ -270,8 +267,7 @@ static int f7188x_gpio_direction_out(struct gpio_chip *chip,
|
|
|
static void f7188x_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
|
|
|
{
|
|
|
int err;
|
|
|
- struct f7188x_gpio_bank *bank =
|
|
|
- container_of(chip, struct f7188x_gpio_bank, chip);
|
|
|
+ struct f7188x_gpio_bank *bank = gpiochip_get_data(chip);
|
|
|
struct f7188x_sio *sio = bank->data->sio;
|
|
|
u8 data_out;
|
|
|
|
|
@@ -336,7 +332,7 @@ static int f7188x_gpio_probe(struct platform_device *pdev)
|
|
|
bank->chip.parent = &pdev->dev;
|
|
|
bank->data = data;
|
|
|
|
|
|
- err = gpiochip_add(&bank->chip);
|
|
|
+ err = gpiochip_add_data(&bank->chip, bank);
|
|
|
if (err) {
|
|
|
dev_err(&pdev->dev,
|
|
|
"Failed to register gpiochip %d: %d\n",
|