regmap-irq: Drop map from handle_mask_sync() parameters
Remove the map parameter from the struct regmap_irq_chip callback handle_mask_sync() because it can be passed via the irq_drv_data parameter instead. The gpio-104-dio-48e driver is the only consumer of this callback and is thus updated accordingly. Reviewed-by: Linus Walleij <linus.walleij@linaro.org Signed-off-by: William Breathitt Gray <william.gray@linaro.org Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com Link: https://lore.kernel.org/r/1f44fb0fbcd3dccea3371215b00f1b9a956c1a12.1679323449.git.william.gray@linaro.org Signed-off-by: Mark Brown <broonie@kernel.org
This commit is contained in:
Родитель
b5c506b163
Коммит
69da5aa99e
|
@ -116,8 +116,7 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
|
|||
for (i = 0; i < d->chip->num_regs; i++) {
|
||||
if (d->mask_base) {
|
||||
if (d->chip->handle_mask_sync)
|
||||
d->chip->handle_mask_sync(d->map, i,
|
||||
d->mask_buf_def[i],
|
||||
d->chip->handle_mask_sync(i, d->mask_buf_def[i],
|
||||
d->mask_buf[i],
|
||||
d->chip->irq_drv_data);
|
||||
else {
|
||||
|
@ -920,7 +919,7 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
|
|||
|
||||
if (d->mask_base) {
|
||||
if (chip->handle_mask_sync) {
|
||||
ret = chip->handle_mask_sync(d->map, i,
|
||||
ret = chip->handle_mask_sync(i,
|
||||
d->mask_buf_def[i],
|
||||
d->mask_buf[i],
|
||||
chip->irq_drv_data);
|
||||
|
|
|
@ -110,7 +110,7 @@ struct dio48e_gpio {
|
|||
unsigned int irq_mask;
|
||||
};
|
||||
|
||||
static int dio48e_handle_mask_sync(struct regmap *const map, const int index,
|
||||
static int dio48e_handle_mask_sync(const int index,
|
||||
const unsigned int mask_buf_def,
|
||||
const unsigned int mask_buf,
|
||||
void *const irq_drv_data)
|
||||
|
|
|
@ -1658,8 +1658,7 @@ struct regmap_irq_chip {
|
|||
|
||||
int (*handle_pre_irq)(void *irq_drv_data);
|
||||
int (*handle_post_irq)(void *irq_drv_data);
|
||||
int (*handle_mask_sync)(struct regmap *map, int index,
|
||||
unsigned int mask_buf_def,
|
||||
int (*handle_mask_sync)(int index, unsigned int mask_buf_def,
|
||||
unsigned int mask_buf, void *irq_drv_data);
|
||||
int (*set_type_virt)(unsigned int **buf, unsigned int type,
|
||||
unsigned long hwirq, int reg);
|
||||
|
|
Загрузка…
Ссылка в новой задаче