mfd: stmpe: Revert "Constify static struct resource"
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 commit8d7b3a6dac
. Fixes:8d7b3a6dac
("mfd: stmpe: Constify static struct resource") Reported-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Rikard Falkeborn <rikard.falkeborn@gmail.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
parent
911490a5ca
commit
cb9e880a79
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue