| Message ID | 20230208105542.9459-1-william.gray@linaro.org |
|---|---|
| State | Accepted |
| Commit | b961b2aa2f64a828a77749b82989ba2968cdf344 |
| Headers | show |
| Series | gpio: 104-dio-48e: Utilize mask_buf_def in handle_mask_sync() callback | expand |
On Wed, Feb 15, 2023 at 8:39 PM William Breathitt Gray <william.gray@linaro.org> wrote: > > The mask_buf_def argument provides a mask of all the maskable lines. > Utilize mask_buf_def rather than hardcode an "all_masked" mask. > > Signed-off-by: William Breathitt Gray <william.gray@linaro.org> > --- > drivers/gpio/gpio-104-dio-48e.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48e.c > index a3846faf3780..74e2721f2613 100644 > --- a/drivers/gpio/gpio-104-dio-48e.c > +++ b/drivers/gpio/gpio-104-dio-48e.c > @@ -106,7 +106,6 @@ static int dio48e_handle_mask_sync(struct regmap *const map, const int index, > { > unsigned int *const irq_mask = irq_drv_data; > const unsigned int prev_mask = *irq_mask; > - const unsigned int all_masked = GENMASK(1, 0); > int err; > unsigned int val; > > @@ -118,7 +117,7 @@ static int dio48e_handle_mask_sync(struct regmap *const map, const int index, > *irq_mask = mask_buf; > > /* if all previously masked, enable interrupts when unmasking */ > - if (prev_mask == all_masked) { > + if (prev_mask == mask_buf_def) { > err = regmap_write(map, DIO48E_CLEAR_INTERRUPT, 0x00); > if (err) > return err; > @@ -126,7 +125,7 @@ static int dio48e_handle_mask_sync(struct regmap *const map, const int index, > } > > /* if all are currently masked, disable interrupts */ > - if (mask_buf == all_masked) > + if (mask_buf == mask_buf_def) > return regmap_read(map, DIO48E_DISABLE_INTERRUPT, &val); > > return 0; > > base-commit: 4827aae061337251bb91801b316157a78b845ec7 > -- > 2.39.1 > Applied, thanks! Bart
diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-48e.c index a3846faf3780..74e2721f2613 100644 --- a/drivers/gpio/gpio-104-dio-48e.c +++ b/drivers/gpio/gpio-104-dio-48e.c @@ -106,7 +106,6 @@ static int dio48e_handle_mask_sync(struct regmap *const map, const int index, { unsigned int *const irq_mask = irq_drv_data; const unsigned int prev_mask = *irq_mask; - const unsigned int all_masked = GENMASK(1, 0); int err; unsigned int val; @@ -118,7 +117,7 @@ static int dio48e_handle_mask_sync(struct regmap *const map, const int index, *irq_mask = mask_buf; /* if all previously masked, enable interrupts when unmasking */ - if (prev_mask == all_masked) { + if (prev_mask == mask_buf_def) { err = regmap_write(map, DIO48E_CLEAR_INTERRUPT, 0x00); if (err) return err; @@ -126,7 +125,7 @@ static int dio48e_handle_mask_sync(struct regmap *const map, const int index, } /* if all are currently masked, disable interrupts */ - if (mask_buf == all_masked) + if (mask_buf == mask_buf_def) return regmap_read(map, DIO48E_DISABLE_INTERRUPT, &val); return 0;
The mask_buf_def argument provides a mask of all the maskable lines. Utilize mask_buf_def rather than hardcode an "all_masked" mask. Signed-off-by: William Breathitt Gray <william.gray@linaro.org> --- drivers/gpio/gpio-104-dio-48e.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) base-commit: 4827aae061337251bb91801b316157a78b845ec7