[PATCH 00/35 linux-next] constify of_device_id array

This small patchset adds const to of_device_id arrays in
drivers branch.

Fabian Frederick (35):
  ata: constify of_device_id array
  regulator: constify of_device_id array
  thermal: constify of_device_id array
  tty/hvc_opal: constify of_device_id array
  tty: constify of_device_id array
  power: constify of_device_id array
  char: constify of_device_id array
  dma: constify of_device_id array
  iio: constify of_device_id array
  misc: constify of_device_id array
  usb: gadget: constify of_device_id array
  mtd: constify of_device_id array
  w1: constify of_device_id array
  ide: pmac: constify of_device_id array
  spi: constify of_device_id array
  video: constify of_device_id array
  coresight-replicator: constify of_device_id array
  macintosh: constify of_device_id array
  virtio_mmio: constify of_device_id array
  swim3: constify of_device_id array
  mfd: constify of_device_id array
  soc: ti: constify of_device_id array
  [media]: constify of_device_id array
  Input: constify of_device_id array
  PCI: constify of_device_id array
  hwmon: constify of_device_id array
  reset: sti: constify of_device_id array
  uio: constify of_device_id array
  gpu: constify of_device_id array
  devfreq: constify of_device_id array
  EDAC: constify of_device_id array
  clk: constify of_device_id array
  mmc: constify of_device_id array
  Staging: octeon: constify of_device_id array
  pinctrl: constify of_device_id array

 drivers/ata/pata_macio.c                     | 2 +-
 drivers/ata/pata_mpc52xx.c                   | 2 +-
 drivers/ata/pata_octeon_cf.c                 | 2 +-
 drivers/ata/pata_of_platform.c               | 2 +-
 drivers/ata/sata_fsl.c                       | 2 +-
 drivers/ata/sata_mv.c                        | 2 +-
 drivers/ata/sata_rcar.c                      | 2 +-
 drivers/block/swim3.c                        | 2 +-
 drivers/char/hw_random/pasemi-rng.c          | 2 +-
 drivers/char/hw_random/powernv-rng.c         | 2 +-
 drivers/char/hw_random/ppc4xx-rng.c          | 2 +-
 drivers/char/ipmi/ipmi_si_intf.c             | 4 ++--
 drivers/char/xillybus/xillybus_of.c          | 2 +-
 drivers/clk/clk-palmas.c                     | 2 +-
 drivers/clk/st/clkgen-fsyn.c                 | 2 +-
 drivers/clk/st/clkgen-mux.c                  | 8 ++++----
 drivers/clk/st/clkgen-pll.c                  | 4 ++--
 drivers/clk/ti/clk-dra7-atl.c                | 2 +-
 drivers/clk/ti/clockdomain.c                 | 2 +-
 drivers/clk/versatile/clk-vexpress-osc.c     | 2 +-
 drivers/coresight/coresight-replicator.c     | 2 +-
 drivers/devfreq/event/exynos-ppmu.c          | 2 +-
 drivers/devfreq/tegra-devfreq.c              | 2 +-
 drivers/dma/bestcomm/bestcomm.c              | 4 ++--
 drivers/dma/k3dma.c                          | 2 +-
 drivers/dma/mmp_pdma.c                       | 2 +-
 drivers/dma/mmp_tdma.c                       | 2 +-
 drivers/dma/mpc512x_dma.c                    | 2 +-
 drivers/dma/mv_xor.c                         | 2 +-
 drivers/dma/sirf-dma.c                       | 2 +-
 drivers/dma/sun6i-dma.c                      | 2 +-
 drivers/edac/highbank_mc_edac.c              | 2 +-
 drivers/edac/mpc85xx_edac.c                  | 4 ++--
 drivers/edac/ppc4xx_edac.c                   | 2 +-
 drivers/edac/synopsys_edac.c                 | 2 +-
 drivers/gpio/gpio-mpc8xxx.c                  | 2 +-
 drivers/gpio/gpio-octeon.c                   | 2 +-
 drivers/gpio/gpio-tz1090-pdc.c               | 2 +-
 drivers/gpio/gpio-tz1090.c                   | 2 +-
 drivers/gpio/gpio-zynq.c                     | 2 +-
 drivers/gpu/drm/armada/armada_crtc.c         | 2 +-
 drivers/gpu/drm/exynos/exynos_drm_dsi.c      | 2 +-
 drivers/gpu/drm/exynos/exynos_hdmi.c         | 2 +-
 drivers/gpu/drm/exynos/exynos_mixer.c        | 2 +-
 drivers/gpu/drm/panel/panel-ld9040.c         | 2 +-
 drivers/gpu/drm/panel/panel-s6e8aa0.c        | 2 +-
 drivers/gpu/drm/sti/sti_dvo.c                | 2 +-
 drivers/gpu/drm/sti/sti_hqvdp.c              | 2 +-
 drivers/gpu/drm/tilcdc/tilcdc_drv.c          | 4 ++--
 drivers/gpu/drm/tilcdc/tilcdc_panel.c        | 2 +-
 drivers/gpu/drm/tilcdc/tilcdc_slave.c        | 4 ++--
 drivers/gpu/drm/tilcdc/tilcdc_tfp410.c       | 4 ++--
 drivers/gpu/host1x/dev.c                     | 2 +-
 drivers/gpu/host1x/mipi.c                    | 2 +-
 drivers/hwmon/pwm-fan.c                      | 2 +-
 drivers/hwmon/vexpress.c                     | 2 +-
 drivers/ide/pmac.c                           | 2 +-
 drivers/iio/common/ssp_sensors/ssp_dev.c     | 2 +-
 drivers/input/misc/palmas-pwrbutton.c        | 2 +-
 drivers/input/misc/regulator-haptic.c        | 2 +-
 drivers/input/misc/tps65218-pwrbutton.c      | 2 +-
 drivers/input/touchscreen/ar1021_i2c.c       | 2 +-
 drivers/macintosh/mediabay.c                 | 2 +-
 drivers/macintosh/rack-meter.c               | 2 +-
 drivers/media/i2c/adv7604.c                  | 2 +-
 drivers/media/platform/fsl-viu.c             | 2 +-
 drivers/media/platform/soc_camera/rcar_vin.c | 2 +-
 drivers/media/rc/gpio-ir-recv.c              | 2 +-
 drivers/media/rc/ir-hix5hd2.c                | 2 +-
 drivers/media/rc/st_rc.c                     | 2 +-
 drivers/mfd/hi6421-pmic-core.c               | 2 +-
 drivers/mfd/rk808.c                          | 2 +-
 drivers/mfd/twl4030-power.c                  | 2 +-
 drivers/misc/carma/carma-fpga-program.c      | 2 +-
 drivers/misc/carma/carma-fpga.c              | 2 +-
 drivers/misc/lis3lv02d/lis3lv02d_i2c.c       | 2 +-
 drivers/misc/lis3lv02d/lis3lv02d_spi.c       | 2 +-
 drivers/misc/sram.c                          | 2 +-
 drivers/mmc/host/mmc_spi.c                   | 2 +-
 drivers/mmc/host/wmt-sdmmc.c                 | 2 +-
 drivers/mtd/devices/docg3.c                  | 2 +-
 drivers/mtd/maps/physmap_of.c                | 4 ++--
 drivers/mtd/nand/mpc5121_nfc.c               | 2 +-
 drivers/mtd/spi-nor/fsl-quadspi.c            | 2 +-
 drivers/pci/host/pci-rcar-gen2.c             | 2 +-
 drivers/pci/host/pcie-xilinx.c               | 2 +-
 drivers/pinctrl/bcm/pinctrl-bcm2835.c        | 2 +-
 drivers/pinctrl/mediatek/pinctrl-mt8135.c    | 2 +-
 drivers/pinctrl/mediatek/pinctrl-mt8173.c    | 2 +-
 drivers/pinctrl/mvebu/pinctrl-armada-370.c   | 2 +-
 drivers/pinctrl/mvebu/pinctrl-armada-375.c   | 2 +-
 drivers/pinctrl/mvebu/pinctrl-armada-38x.c   | 2 +-
 drivers/pinctrl/mvebu/pinctrl-armada-39x.c   | 2 +-
 drivers/pinctrl/mvebu/pinctrl-armada-xp.c    | 2 +-
 drivers/pinctrl/mvebu/pinctrl-kirkwood.c     | 2 +-
 drivers/pinctrl/mvebu/pinctrl-orion.c        | 2 +-
 drivers/pinctrl/pinctrl-as3722.c             | 2 +-
 drivers/pinctrl/pinctrl-at91.c               | 4 ++--
 drivers/pinctrl/pinctrl-palmas.c             | 2 +-
 drivers/pinctrl/pinctrl-single.c             | 4 ++--
 drivers/pinctrl/pinctrl-st.c                 | 2 +-
 drivers/pinctrl/pinctrl-tz1090-pdc.c         | 2 +-
 drivers/pinctrl/pinctrl-tz1090.c             | 2 +-
 drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c    | 2 +-
 drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c   | 2 +-
 drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c    | 2 +-
 drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c  | 2 +-
 drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c    | 2 +-
 drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c   | 2 +-
 drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c    | 2 +-
 drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c  | 2 +-
 drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c    | 2 +-
 drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c    | 2 +-
 drivers/pinctrl/vt8500/pinctrl-vt8500.c      | 2 +-
 drivers/pinctrl/vt8500/pinctrl-wm8505.c      | 2 +-
 drivers/pinctrl/vt8500/pinctrl-wm8650.c      | 2 +-
 drivers/pinctrl/vt8500/pinctrl-wm8750.c      | 2 +-
 drivers/pinctrl/vt8500/pinctrl-wm8850.c      | 2 +-
 drivers/power/charger-manager.c              | 2 +-
 drivers/power/reset/at91-poweroff.c          | 2 +-
 drivers/power/reset/at91-reset.c             | 4 ++--
 drivers/power/reset/hisi-reboot.c            | 2 +-
 drivers/power/reset/keystone-reset.c         | 2 +-
 drivers/power/reset/st-poweroff.c            | 2 +-
 drivers/power/reset/syscon-reboot.c          | 2 +-
 drivers/power/reset/vexpress-poweroff.c      | 2 +-
 drivers/power/reset/xgene-reboot.c           | 2 +-
 drivers/power/tps65090-charger.c             | 2 +-
 drivers/regulator/palmas-regulator.c         | 2 +-
 drivers/reset/sti/reset-stih407.c            | 2 +-
 drivers/reset/sti/reset-stih415.c            | 2 +-
 drivers/reset/sti/reset-stih416.c            | 2 +-
 drivers/soc/ti/knav_dma.c                    | 2 +-
 drivers/soc/ti/knav_qmss_queue.c             | 2 +-
 drivers/spi/spi-mpc512x-psc.c                | 2 +-
 drivers/spi/spi-octeon.c                     | 2 +-
 drivers/spi/spi-st-ssc4.c                    | 2 +-
 drivers/staging/octeon-usb/octeon-hcd.c      | 2 +-
 drivers/staging/octeon/ethernet.c            | 2 +-
 drivers/thermal/st/st_thermal_memmap.c       | 2 +-
 drivers/thermal/st/st_thermal_syscfg.c       | 2 +-
 drivers/tty/hvc/hvc_opal.c                   | 2 +-
 drivers/tty/serial/apbuart.c                 | 2 +-
 drivers/tty/serial/cpm_uart/cpm_uart_core.c  | 2 +-
 drivers/tty/serial/fsl_lpuart.c              | 2 +-
 drivers/tty/serial/mpc52xx_uart.c            | 2 +-
 drivers/tty/serial/mxs-auart.c               | 2 +-
 drivers/tty/serial/of_serial.c               | 4 ++--
 drivers/tty/serial/pmac_zilog.c              | 2 +-
 drivers/tty/serial/pxa.c                     | 2 +-
 drivers/tty/serial/serial-tegra.c            | 2 +-
 drivers/tty/serial/sirfsoc_uart.c            | 2 +-
 drivers/tty/serial/st-asc.c                  | 2 +-
 drivers/tty/serial/uartlite.c                | 2 +-
 drivers/tty/serial/ucc_uart.c                | 2 +-
 drivers/tty/serial/xilinx_uartps.c           | 2 +-
 drivers/uio/uio_pdrv_genirq.c                | 2 +-
 drivers/usb/gadget/udc/pxa27x_udc.c          | 2 +-
 drivers/video/backlight/gpio_backlight.c     | 2 +-
 drivers/video/backlight/pwm_bl.c             | 2 +-
 drivers/video/fbdev/fsl-diu-fb.c             | 2 +-
 drivers/video/fbdev/grvga.c                  | 2 +-
 drivers/video/fbdev/mb862xx/mb862xxfbdrv.c   | 2 +-
 drivers/video/fbdev/ocfb.c                   | 2 +-
 drivers/video/fbdev/platinumfb.c             | 2 +-
 drivers/video/fbdev/xilinxfb.c               | 2 +-
 drivers/virtio/virtio_mmio.c                 | 2 +-
 drivers/w1/masters/mxc_w1.c                  | 2 +-
 drivers/w1/masters/omap_hdq.c                | 2 +-
 drivers/w1/masters/w1-gpio.c                 | 2 +-
 170 files changed, 185 insertions(+), 185 deletions(-)

-- 
2.1.0

of_device_id is always used as const.
(See driver.of_match_table and open firmware functions)

Signed-off-by: Fabian Frederick <redacted>
---
 drivers/tty/hvc/hvc_opal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/hvc/hvc_opal.c b/drivers/tty/hvc/hvc_opal.c
index 071551b..543b234 100644
--- a/drivers/tty/hvc/hvc_opal.c
+++ b/drivers/tty/hvc/hvc_opal.c

@@ -41,7 +41,7 @@
 
 static const char hvc_opal_name[] = "hvc_opal";
 
-static struct of_device_id hvc_opal_match[] = {
+static const struct of_device_id hvc_opal_match[] = {
 	{ .name = "serial", .compatible = "ibm,opal-console-raw" },
 	{ .name = "serial", .compatible = "ibm,opal-console-hvsi" },
 	{ },

-- 
2.1.0

of_device_id is always used as const.
(See driver.of_match_table and open firmware functions)

Signed-off-by: Fabian Frederick <redacted>
---
 drivers/tty/serial/apbuart.c                | 2 +-
 drivers/tty/serial/cpm_uart/cpm_uart_core.c | 2 +-
 drivers/tty/serial/fsl_lpuart.c             | 2 +-
 drivers/tty/serial/mpc52xx_uart.c           | 2 +-
 drivers/tty/serial/mxs-auart.c              | 2 +-
 drivers/tty/serial/of_serial.c              | 4 ++--
 drivers/tty/serial/pmac_zilog.c             | 2 +-
 drivers/tty/serial/pxa.c                    | 2 +-
 drivers/tty/serial/serial-tegra.c           | 2 +-
 drivers/tty/serial/sirfsoc_uart.c           | 2 +-
 drivers/tty/serial/st-asc.c                 | 2 +-
 drivers/tty/serial/uartlite.c               | 2 +-
 drivers/tty/serial/ucc_uart.c               | 2 +-
 drivers/tty/serial/xilinx_uartps.c          | 2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/tty/serial/apbuart.c b/drivers/tty/serial/apbuart.c
index 4f0f95e..f3af317 100644
--- a/drivers/tty/serial/apbuart.c
+++ b/drivers/tty/serial/apbuart.c

@@ -572,7 +572,7 @@ static int apbuart_probe(struct platform_device *op)
 	return 0;
 }
 
-static struct of_device_id apbuart_match[] = {
+static const struct of_device_id apbuart_match[] = {
 	{
 	 .name = "GAISLER_APBUART",
 	 },

diff --git a/drivers/tty/serial/cpm_uart/cpm_uart_core.c b/drivers/tty/serial/cpm_uart/cpm_uart_core.c
index fddb1fd..08431ad 100644
--- a/drivers/tty/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/tty/serial/cpm_uart/cpm_uart_core.c

@@ -1435,7 +1435,7 @@ static int cpm_uart_remove(struct platform_device *ofdev)
 	return uart_remove_one_port(&cpm_reg, &pinfo->port);
 }
 
-static struct of_device_id cpm_uart_match[] = {
+static const struct of_device_id cpm_uart_match[] = {
 	{
 		.compatible = "fsl,cpm1-smc-uart",
 	},

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index b1893f3..946273a 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c

@@ -257,7 +257,7 @@ struct lpuart_port {
 	struct timer_list	lpuart_timer;
 };
 
-static struct of_device_id lpuart_dt_ids[] = {
+static const struct of_device_id lpuart_dt_ids[] = {
 	{
 		.compatible = "fsl,vf610-lpuart",
 	},

diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c
index 3308ef2..1589f17 100644
--- a/drivers/tty/serial/mpc52xx_uart.c
+++ b/drivers/tty/serial/mpc52xx_uart.c

@@ -1717,7 +1717,7 @@ static struct uart_driver mpc52xx_uart_driver = {
 /* OF Platform Driver                                                       */
 /* ======================================================================== */
 
-static struct of_device_id mpc52xx_uart_of_match[] = {
+static const struct of_device_id mpc52xx_uart_of_match[] = {
 #ifdef CONFIG_PPC_MPC52xx
 	{ .compatible = "fsl,mpc5200b-psc-uart", .data = &mpc5200b_psc_ops, },
 	{ .compatible = "fsl,mpc5200-psc-uart", .data = &mpc52xx_psc_ops, },

diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index 20a863b..f7e5825 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c

@@ -176,7 +176,7 @@ static struct platform_device_id mxs_auart_devtype[] = {
 };
 MODULE_DEVICE_TABLE(platform, mxs_auart_devtype);
 
-static struct of_device_id mxs_auart_dt_ids[] = {
+static const struct of_device_id mxs_auart_dt_ids[] = {
 	{
 		.compatible = "fsl,imx28-auart",
 		.data = &mxs_auart_devtype[IMX28_AUART]

diff --git a/drivers/tty/serial/of_serial.c b/drivers/tty/serial/of_serial.c
index 33fb94f..d8c4eea 100644
--- a/drivers/tty/serial/of_serial.c
+++ b/drivers/tty/serial/of_serial.c

@@ -155,7 +155,7 @@ out:
 /*
  * Try to register a serial port
  */
-static struct of_device_id of_platform_serial_table[];
+static const struct of_device_id of_platform_serial_table[];
 static int of_platform_serial_probe(struct platform_device *ofdev)
 {
 	const struct of_device_id *match;

@@ -320,7 +320,7 @@ static SIMPLE_DEV_PM_OPS(of_serial_pm_ops, of_serial_suspend, of_serial_resume);
 /*
  * A few common types, add more as needed.
  */
-static struct of_device_id of_platform_serial_table[] = {
+static const struct of_device_id of_platform_serial_table[] = {
 	{ .compatible = "ns8250",   .data = (void *)PORT_8250, },
 	{ .compatible = "ns16450",  .data = (void *)PORT_16450, },
 	{ .compatible = "ns16550a", .data = (void *)PORT_16550A, },

diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 8f51579..e156e39 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c

@@ -1846,7 +1846,7 @@ static int __init pmz_register(void)
 
 #ifdef CONFIG_PPC_PMAC
 
-static struct of_device_id pmz_match[] = 
+static const struct of_device_id pmz_match[] =
 {
 	{
 	.name		= "ch-a",

diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index d5d0626..9becba6 100644
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c

@@ -824,7 +824,7 @@ static const struct dev_pm_ops serial_pxa_pm_ops = {
 };
 #endif
 
-static struct of_device_id serial_pxa_dt_ids[] = {
+static const struct of_device_id serial_pxa_dt_ids[] = {
 	{ .compatible = "mrvl,pxa-uart", },
 	{ .compatible = "mrvl,mmp-uart", },
 	{}

diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c
index 48e6e41..1d5ea39 100644
--- a/drivers/tty/serial/serial-tegra.c
+++ b/drivers/tty/serial/serial-tegra.c

@@ -1251,7 +1251,7 @@ static struct tegra_uart_chip_data tegra30_uart_chip_data = {
 	.support_clk_src_div		= true,
 };
 
-static struct of_device_id tegra_uart_of_match[] = {
+static const struct of_device_id tegra_uart_of_match[] = {
 	{
 		.compatible	= "nvidia,tegra30-hsuart",
 		.data		= &tegra30_uart_chip_data,

diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index 27ed0e9..9de3eab 100644
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c

@@ -1269,7 +1269,7 @@ static struct uart_driver sirfsoc_uart_drv = {
 #endif
 };
 
-static struct of_device_id sirfsoc_uart_ids[] = {
+static const struct of_device_id sirfsoc_uart_ids[] = {
 	{ .compatible = "sirf,prima2-uart", .data = &sirfsoc_uart,},
 	{ .compatible = "sirf,atlas7-uart", .data = &sirfsoc_uart},
 	{ .compatible = "sirf,prima2-usp-uart", .data = &sirfsoc_usp},

diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c
index 712b03a..d625664 100644
--- a/drivers/tty/serial/st-asc.c
+++ b/drivers/tty/serial/st-asc.c

@@ -720,7 +720,7 @@ static struct asc_port *asc_of_get_asc_port(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_OF
-static struct of_device_id asc_match[] = {
+static const struct of_device_id asc_match[] = {
 	{ .compatible = "st,asc", },
 	{},
 };

diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index 189f52e..708eead 100644
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c

@@ -622,7 +622,7 @@ static int ulite_release(struct device *dev)
 
 #if defined(CONFIG_OF)
 /* Match table for of_platform binding */
-static struct of_device_id ulite_of_match[] = {
+static const struct of_device_id ulite_of_match[] = {
 	{ .compatible = "xlnx,opb-uartlite-1.00.b", },
 	{ .compatible = "xlnx,xps-uartlite-1.00.a", },
 	{}

diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index 14d10fc..7d2532b 100644
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c

@@ -1473,7 +1473,7 @@ static int ucc_uart_remove(struct platform_device *ofdev)
 	return 0;
 }
 
-static struct of_device_id ucc_uart_match[] = {
+static const struct of_device_id ucc_uart_match[] = {
 	{
 		.type = "serial",
 		.compatible = "ucc_uart",

diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 8f9c543..09258de 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c

@@ -1459,7 +1459,7 @@ static int cdns_uart_remove(struct platform_device *pdev)
 }
 
 /* Match table for of_platform binding */
-static struct of_device_id cdns_uart_of_match[] = {
+static const struct of_device_id cdns_uart_of_match[] = {
 	{ .compatible = "xlnx,xuartps", },
 	{ .compatible = "cdns,uart-r1p8", },
 	{}

-- 
2.1.0

of_device_id is always used as const.
(See driver.of_match_table and open firmware functions)

Signed-off-by: Fabian Frederick <redacted>
---
 drivers/char/hw_random/pasemi-rng.c  | 2 +-
 drivers/char/hw_random/powernv-rng.c | 2 +-
 drivers/char/hw_random/ppc4xx-rng.c  | 2 +-
 drivers/char/ipmi/ipmi_si_intf.c     | 4 ++--
 drivers/char/xillybus/xillybus_of.c  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/char/hw_random/pasemi-rng.c b/drivers/char/hw_random/pasemi-rng.c
index 3eb7bdd..51cb1d5 100644
--- a/drivers/char/hw_random/pasemi-rng.c
+++ b/drivers/char/hw_random/pasemi-rng.c

@@ -133,7 +133,7 @@ static int rng_remove(struct platform_device *dev)
 	return 0;
 }
 
-static struct of_device_id rng_match[] = {
+static const struct of_device_id rng_match[] = {
 	{ .compatible      = "1682m-rng", },
 	{ .compatible      = "pasemi,pwrficient-rng", },
 	{ },

diff --git a/drivers/char/hw_random/powernv-rng.c b/drivers/char/hw_random/powernv-rng.c
index 3f4f632..263a5bb 100644
--- a/drivers/char/hw_random/powernv-rng.c
+++ b/drivers/char/hw_random/powernv-rng.c

@@ -61,7 +61,7 @@ static int powernv_rng_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static struct of_device_id powernv_rng_match[] = {
+static const struct of_device_id powernv_rng_match[] = {
 	{ .compatible	= "ibm,power-rng",},
 	{},
 };

diff --git a/drivers/char/hw_random/ppc4xx-rng.c b/drivers/char/hw_random/ppc4xx-rng.c
index c85d31a..b2cfda0 100644
--- a/drivers/char/hw_random/ppc4xx-rng.c
+++ b/drivers/char/hw_random/ppc4xx-rng.c

@@ -123,7 +123,7 @@ static int ppc4xx_rng_remove(struct platform_device *dev)
 	return 0;
 }
 
-static struct of_device_id ppc4xx_rng_match[] = {
+static const struct of_device_id ppc4xx_rng_match[] = {
 	{ .compatible = "ppc4xx-rng", },
 	{ .compatible = "amcc,ppc460ex-rng", },
 	{ .compatible = "amcc,ppc440epx-rng", },

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 003b4c1..97cf9c2 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c

@@ -2664,7 +2664,7 @@ static struct pci_driver ipmi_pci_driver = {
 };
 #endif /* CONFIG_PCI */
 
-static struct of_device_id ipmi_match[];
+static const struct of_device_id ipmi_match[];
 static int ipmi_probe(struct platform_device *dev)
 {
 #ifdef CONFIG_OF

@@ -2761,7 +2761,7 @@ static int ipmi_remove(struct platform_device *dev)
 	return 0;
 }
 
-static struct of_device_id ipmi_match[] =
+static const struct of_device_id ipmi_match[] =
 {
 	{ .type = "ipmi", .compatible = "ipmi-kcs",
 	  .data = (void *)(unsigned long) SI_KCS },

diff --git a/drivers/char/xillybus/xillybus_of.c b/drivers/char/xillybus/xillybus_of.c
index 2002a3a..7818650 100644
--- a/drivers/char/xillybus/xillybus_of.c
+++ b/drivers/char/xillybus/xillybus_of.c

@@ -31,7 +31,7 @@ MODULE_LICENSE("GPL v2");
 static const char xillyname[] = "xillybus_of";
 
 /* Match table for of_platform binding */
-static struct of_device_id xillybus_of_match[] = {
+static const struct of_device_id xillybus_of_match[] = {
 	{ .compatible = "xillybus,xillybus-1.00.a", },
 	{ .compatible = "xlnx,xillybus-1.00.a", }, /* Deprecated */
 	{}

-- 
2.1.0

On 03/16/2015 02:17 PM, Fabian Frederick wrote:

of_device_id is always used as const.
(See driver.of_match_table and open firmware functions)

Signed-off-by: Fabian Frederick<redacted>

...

  drivers/tty/serial/ucc_uart.c               | 2 +-

For this driver:

Acked-by: Timur Tabi <redacted>

Hi Fabian

On 03/16/2015 08:17 PM, Fabian Frederick wrote:

of_device_id is always used as const.
(See driver.of_match_table and open firmware functions)

Signed-off-by: Fabian Frederick <redacted>
---

....

  drivers/tty/serial/st-asc.c                 | 2 +-

For this driver

Acked-by: Patrice Chotard <redacted>

Thanks