[PATCH 11/11] gpio/gpio-omap: make platformdata used as of_device_id.data const

[PATCH 11/11] gpio/gpio-omap: make platformdata used as of_device_id.data const

[Linus Walleij]

On Fri, Jul 13, 2012 at 2:32 PM,  <y@pengutronix.de> wrote:

> From: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
>
> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> Cc: Linus Walleij <linus.walleij@stericsson.com>

I'd like Kevin to look at this too.

Thanks,
Linus Walleij

[PATCH 00/11] make struct of_device_id.data const

[y at pengutronix.de]

From: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>

Hello,

this series' goal is to make struct of_device_id.data const.
Conceptually a driver must not modify the data contained there so making
it const is the right thing.

This change might introduce warnings because drivers don't use const to
access the data pointed to by of_device_id.data. In most cases the fix
is to add some consts.

This series (apart from adding this const in patch 10) fixes all drivers
covered by all arm defconfigs (based on v3.5-rc6).

There is one exception though:
drivers/regulator/twl-regulator.c (build in omap2plus_defconfig) now
issues:

	drivers/regulator/twl-regulator.c: In function 'twlreg_probe':
	drivers/regulator/twl-regulator.c:1181: warning: assignment discards qualifiers from pointer target type
	drivers/regulator/twl-regulator.c:1190: warning: assignment discards qualifiers from pointer target type

that is because this driver really modifies his .of_match_table in the
precence of a traditionally probed device.
I didn't check deeply, but probably the easiest fix is to remove
traditional platform support. Don't know if omap is ready for that
though.

And also patch 11 adds some more consts that are possible now after
patch 10.

This series is available in my git tree at:

	git://git.pengutronix.de/git/ukl/linux.git ofdeviceiddata

Best regards
Uwe

Uwe Kleine-K?nig (11):
  spi/imx: make spi_imx_data.devtype_data member point to const data
  serial/imx: make imx_port.devdata member point to const data
  ARM: cache-l2x0: add a const qualifier
  misc/atmel_tc: make atmel_tc.tcb_config member point to const data
  gpio/gpio-omap.c: add a const qualifier
  i2c/i2c-omap: add a const qualifier
  dmaengine: at_hdmac: add a few const qualifiers
  spi/spi-omap2-mcspi: add a const qualifier
  mmc/omap_hsmmc: add a const qualifier
  of: add const to struct of_device_id.data
  gpio/gpio-omap: make platformdata used as of_device_id.data const

 arch/arm/mm/cache-l2x0.c        |    2 +-
 drivers/dma/at_hdmac.c          |    4 ++--
 drivers/gpio/gpio-omap.c        |    8 ++++----
 drivers/i2c/busses/i2c-omap.c   |    3 ++-
 drivers/mmc/host/omap_hsmmc.c   |    2 +-
 drivers/spi/spi-imx.c           |    2 +-
 drivers/spi/spi-omap2-mcspi.c   |    2 +-
 drivers/tty/serial/imx.c        |    2 +-
 include/linux/atmel_tc.h        |    2 +-
 include/linux/mod_devicetable.h |    2 +-
 10 files changed, 15 insertions(+), 14 deletions(-)

-- 
1.7.10.4

[PATCH 11/11] gpio/gpio-omap: make platformdata used as of_device_id.data const

[y at pengutronix.de]

From: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>

Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
Cc: Linus Walleij <linus.walleij@stericsson.com>
---
 drivers/gpio/gpio-omap.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 019cb7b..12ab547 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1430,19 +1430,19 @@ static struct omap_gpio_reg_offs omap4_gpio_regs = {
 	.fallingdetect =	OMAP4_GPIO_FALLINGDETECT,
 };
 
-static struct omap_gpio_platform_data omap2_pdata = {
+const static struct omap_gpio_platform_data omap2_pdata = {
 	.regs = &omap2_gpio_regs,
 	.bank_width = 32,
 	.dbck_flag = false,
 };
 
-static struct omap_gpio_platform_data omap3_pdata = {
+const static struct omap_gpio_platform_data omap3_pdata = {
 	.regs = &omap2_gpio_regs,
 	.bank_width = 32,
 	.dbck_flag = true,
 };
 
-static struct omap_gpio_platform_data omap4_pdata = {
+const static struct omap_gpio_platform_data omap4_pdata = {
 	.regs = &omap4_gpio_regs,
 	.bank_width = 32,
 	.dbck_flag = true,
-- 
1.7.10.4