korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-13 14:04:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

gpio: pca953x: Drop unused fields in struct pca953x_platform_data

Browse Source 
New code should solely use firmware nodes for the specifics and
not any callbacks.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
This commit is contained in:
Andy Shevchenko 2023-09-01 16:40:32 +03:00 committed by Bartosz Golaszewski
parent 0bb80ecc33
commit 2f4d3e2933
2 changed files with 8 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/gpio/gpio-pca953x.c
View File

@ -211,7 +211,6 @@ struct pca953x_chip {
struct i2c_client *client; struct i2c_client *client;
struct gpio_chip gpio_chip; struct gpio_chip gpio_chip;
const char *const *names;
unsigned long driver_data; unsigned long driver_data;
struct regulator *regulator; struct regulator *regulator;
@ -712,7 +711,6 @@ static void pca953x_setup_gpio(struct pca953x_chip *chip, int gpios)
gc->label = dev_name(&chip->client->dev); gc->label = dev_name(&chip->client->dev);
gc->parent = &chip->client->dev; gc->parent = &chip->client->dev;
gc->owner = THIS_MODULE; gc->owner = THIS_MODULE;
gc->names = chip->names;
} }
#ifdef CONFIG_GPIO_PCA953X_IRQ #ifdef CONFIG_GPIO_PCA953X_IRQ
@ -998,7 +996,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip,
} }
#endif #endif
static int device_pca95xx_init(struct pca953x_chip *chip, u32 invert) static int device_pca95xx_init(struct pca953x_chip *chip)
{ {
DECLARE_BITMAP(val, MAX_LINE); DECLARE_BITMAP(val, MAX_LINE);
u8 regaddr; u8 regaddr;
@ -1016,24 +1014,21 @@ static int device_pca95xx_init(struct pca953x_chip *chip, u32 invert)
if (ret) if (ret)
goto out; goto out;
/* set platform specific polarity inversion */ /* clear polarity inversion */
if (invert) bitmap_zero(val, MAX_LINE);
bitmap_fill(val, MAX_LINE);
else
bitmap_zero(val, MAX_LINE);
ret = pca953x_write_regs(chip, chip->regs->invert, val); ret = pca953x_write_regs(chip, chip->regs->invert, val);
out: out:
return ret; return ret;
} }
static int device_pca957x_init(struct pca953x_chip *chip, u32 invert) static int device_pca957x_init(struct pca953x_chip *chip)
{ {
DECLARE_BITMAP(val, MAX_LINE); DECLARE_BITMAP(val, MAX_LINE);
unsigned int i; unsigned int i;
int ret; int ret;
ret = device_pca95xx_init(chip, invert); ret = device_pca95xx_init(chip);
if (ret) if (ret)
goto out; goto out;
@ -1054,9 +1049,8 @@ static int pca953x_probe(struct i2c_client *client)
{ {
struct pca953x_platform_data *pdata; struct pca953x_platform_data *pdata;
struct pca953x_chip *chip; struct pca953x_chip *chip;
int irq_base = 0; int irq_base;
int ret; int ret;
u32 invert = 0;
struct regulator *reg; struct regulator *reg;
const struct regmap_config *regmap_config; const struct regmap_config *regmap_config;
@ -1068,8 +1062,6 @@ static int pca953x_probe(struct i2c_client *client)
if (pdata) { if (pdata) {
irq_base = pdata->irq_base; irq_base = pdata->irq_base;
chip->gpio_start = pdata->gpio_base; chip->gpio_start = pdata->gpio_base;
invert = pdata->invert;
chip->names = pdata->names;
} else { } else {
struct gpio_desc *reset_gpio; struct gpio_desc *reset_gpio;
@ -1158,10 +1150,10 @@ static int pca953x_probe(struct i2c_client *client)
*/ */
if (PCA_CHIP_TYPE(chip->driver_data) == PCA957X_TYPE) { if (PCA_CHIP_TYPE(chip->driver_data) == PCA957X_TYPE) {
chip->regs = &pca957x_regs; chip->regs = &pca957x_regs;
ret = device_pca957x_init(chip, invert); ret = device_pca957x_init(chip);
} else { } else {
chip->regs = &pca953x_regs; chip->regs = &pca953x_regs;
ret = device_pca95xx_init(chip, invert); ret = device_pca95xx_init(chip);
} }
if (ret) if (ret)
goto err_exit; goto err_exit;
@ -1174,13 +1166,6 @@ static int pca953x_probe(struct i2c_client *client)
if (ret) if (ret)
goto err_exit; goto err_exit;
if (pdata && pdata->setup) {
ret = pdata->setup(client, chip->gpio_chip.base,
chip->gpio_chip.ngpio, pdata->context);
if (ret < 0)
dev_warn(&client->dev, "setup failed, %d\n", ret);
}
return 0; return 0;
err_exit: err_exit:
@ -1190,14 +1175,8 @@ err_exit:
static void pca953x_remove(struct i2c_client *client) static void pca953x_remove(struct i2c_client *client)
{ {
struct pca953x_platform_data *pdata = dev_get_platdata(&client->dev);
struct pca953x_chip *chip = i2c_get_clientdata(client); struct pca953x_chip *chip = i2c_get_clientdata(client);
if (pdata && pdata->teardown) {
pdata->teardown(client, chip->gpio_chip.base,
chip->gpio_chip.ngpio, pdata->context);
}
regulator_disable(chip->regulator); regulator_disable(chip->regulator);
} }

13
include/linux/platform_data/pca953x.h
View File

@ -11,21 +11,8 @@ struct pca953x_platform_data {
/* number of the first GPIO */ /* number of the first GPIO */
unsigned gpio_base; unsigned gpio_base;
/* initial polarity inversion setting */
u32 invert;
/* interrupt base */ /* interrupt base */
int irq_base; int irq_base;
void *context; /* param to setup/teardown */
int (*setup)(struct i2c_client *client,
unsigned gpio, unsigned ngpio,
void *context);
void (*teardown)(struct i2c_client *client,
unsigned gpio, unsigned ngpio,
void *context);
const char *const *names;
}; };
#endif /* _LINUX_PCA953X_H */ #endif /* _LINUX_PCA953X_H */