On Fri, Mar 05, 2021 at 12:07:09AM +0100, Rikard Falkeborn wrote: > In stmpe_devices_init(), the start and end field of these structs are > modified, so they can not be const. Add a comment to those structs that > lacked it to reduce the risk that this happens again. > > This reverts commit 8d7b3a6dac4eae22c58b0853696cbd256966741b.
FWIW, Reviewed-by: Andy Shevchenko <[email protected]> > Fixes: 8d7b3a6dac4e ("mfd: stmpe: Constify static struct resource") > Reported-by: Andy Shevchenko <[email protected]> > Signed-off-by: Rikard Falkeborn <[email protected]> > --- > Changes > V1-V2: Add comments to the structs that they are dynamically modified > Rewrite commit message. > > V1: > https://lore.kernel.org/lkml/[email protected]/ > > drivers/mfd/stmpe.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c > index 90f3292230c9..1dd39483e7c1 100644 > --- a/drivers/mfd/stmpe.c > +++ b/drivers/mfd/stmpe.c > @@ -312,7 +312,7 @@ EXPORT_SYMBOL_GPL(stmpe_set_altfunc); > * GPIO (all variants) > */ > > -static const struct resource stmpe_gpio_resources[] = { > +static struct resource stmpe_gpio_resources[] = { > /* Start and end filled dynamically */ > { > .flags = IORESOURCE_IRQ, > @@ -336,7 +336,8 @@ static const struct mfd_cell stmpe_gpio_cell_noirq = { > * Keypad (1601, 2401, 2403) > */ > > -static const struct resource stmpe_keypad_resources[] = { > +static struct resource stmpe_keypad_resources[] = { > + /* Start and end filled dynamically */ > { > .name = "KEYPAD", > .flags = IORESOURCE_IRQ, > @@ -357,7 +358,8 @@ static const struct mfd_cell stmpe_keypad_cell = { > /* > * PWM (1601, 2401, 2403) > */ > -static const struct resource stmpe_pwm_resources[] = { > +static struct resource stmpe_pwm_resources[] = { > + /* Start and end filled dynamically */ > { > .name = "PWM0", > .flags = IORESOURCE_IRQ, > @@ -445,7 +447,8 @@ static struct stmpe_variant_info stmpe801_noirq = { > * Touchscreen (STMPE811 or STMPE610) > */ > > -static const struct resource stmpe_ts_resources[] = { > +static struct resource stmpe_ts_resources[] = { > + /* Start and end filled dynamically */ > { > .name = "TOUCH_DET", > .flags = IORESOURCE_IRQ, > @@ -467,7 +470,8 @@ static const struct mfd_cell stmpe_ts_cell = { > * ADC (STMPE811) > */ > > -static const struct resource stmpe_adc_resources[] = { > +static struct resource stmpe_adc_resources[] = { > + /* Start and end filled dynamically */ > { > .name = "STMPE_TEMP_SENS", > .flags = IORESOURCE_IRQ, > -- > 2.30.1 > -- With Best Regards, Andy Shevchenko
