Commit cb9e880a authored by Rikard Falkeborn's avatar Rikard Falkeborn Committed by Lee Jones
Browse files

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 commit 8d7b3a6d.

Fixes: 8d7b3a6d ("mfd: stmpe: Constify static struct resource")
Reported-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarRikard Falkeborn <rikard.falkeborn@gmail.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 911490a5

drivers/mfd/stmpe.c

+9 −5
Original line number Diff line number Diff line
@@ -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,