checkpatch: add a rule to check devinitconst mistakes
Subsystems (34)
PATCH 1/1 checkpatch: add a rule to check devinitconst mistakes
From: Andi Kleen <[email protected]>
Check for const __devinitdata and non const __devinitconst
People get this regularly wrong and it breaks the LTO builds, as it causes a section attribute conflict.
This doesn't catch all mistakes -- spreading over multiple lines, getting const pointers wrong, but hopefully the common ones.
--- scripts/checkpatch.pl | 9 +++++++++ 1 file changed, 9 insertions(+)
scripts/checkpatch.pl +9 -0
@@ -2676,6 +2676,15 @@ sub process { } } +# check for __devinitdata with const or const without __devintconst +# XXX should scan multiple lines and handle misplaced consts for pointers + if ($line =~ /const/ && $line =~ /__(dev)?initdata/) { + ERROR("DEVINITCONST", "const init definition must use __devinitconst"); + } + if ($line =~ /__(dev)?initconst/ && $line !~ /\Wconst\W/) { + ERROR("DEVINITCONST", "__devinitconst must have have const definition"); + } + # check for spacing round square brackets; allowed: # 1. with a type on the left -- int [] a; # 2. at the beginning of a line for slice initialisers -- [0...10] = 5,
Signature · 1 line
1.8.3.1
Joe Perches
maintainerQuoted 20 lines · Andi Kleen
From: Andi Kleen <[email protected]>
Check for const
__devinitdataand non const__devinitconstPeople get this regularly wrong and it breaks the LTO builds, as it causes a section attribute conflict.
This doesn't catch all mistakes -- spreading over multiple lines, getting const pointers wrong, but hopefully the common ones.
Signed-off-by Andi Kleen <[email protected]>--- scripts/checkpatch.pl | 9 +++++++++ 1 file changed, 9 insertions(+)scripts/checkpatch.pl +0
-0
scripts/checkpatch.pl sub process { · line 2684
Quoted 9 lines
scripts/checkpatch.pl +6
-0@@ -2676,6 +2676,15 @@ sub process { } } +# check for __devinitdata with const or const without __devintconst +# XXX should scan multiple lines and handle misplaced consts for pointers + if ($line =~ /const/ && $line =~ /__(dev)?initdata/) { + ERROR("DEVINITCONST", "const init definition must use __devinitconst"); + } + if ($line =~ /__(dev)?initconst/ && $line !~ /\Wconst\W/) {
There are no more uses of __devinitconst and__devinitdata in the tree.
Shouldn't these be "\bconst\b", "\b__initdata\b"
and "\b__initconst\b"
I think also there'll be a few too many false
positives for function arguments.
It seems that every use of __initconst is of
the form
[static] const <type> [name] __initconst so
if ($line =~ /\b__initconst\b/ &&
$line !~ /^\+\s*(?:static\b)?\s*const\s+$Type\s*(?:$Ident)?\s*__initconst\b/) {
etc...
}should work reasonably well.
Joe Perches
maintainerPATCH 1/1 checkpatch: add rules to check init attribute and const defects
In reply to Andi KleenPeople get this regularly wrong and it breaks the LTO builds, as it causes a section attribute conflict.
--- scripts/checkpatch.pl | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)
scripts/checkpatch.pl +22 -2
@@ -241,8 +241,11 @@ our $Sparse = qr{ __ref| __rcu }x; - -our $InitAttribute = qr{__(?:mem|cpu|dev|net_|)(?:initdata|initconst|init\b)}; +our $InitAttributePrefix = qr{__(?:mem|cpu|dev|net_|)}; +our $InitAttributeData = qr{$InitAttributePrefix(?:initdata\b)}; +our $InitAttributeConst = qr{$InitAttributePrefix(?:initconst\b)}; +our $InitAttributeInit = qr{$InitAttributePrefix(?:init\b)}; +our $InitAttribute = qr{$InitAttributeData|$InitAttributeConst|$InitAttributeInit}; # Notes to $Attribute: # We need \b after 'init' otherwise 'initconst' will cause a false positive in a check
@@ -2775,6 +2778,23 @@ sub process { } } +# check for $InitAttributeData (ie: __initdata) with const + if ($line =~ /\bconst\b/ && $line =~ /($InitAttributeData)/) { + my $attr = $1; + $attr =~ /($InitAttributePrefix)(.*)/; + my $attr_prefix = $1; + my $attr_type = $2; + ERROR("INIT_ATTRIBUTE", + "Use of const init definition must use ${attr_prefix}initconst\n" . $herecurr); + } + +# check for $InitAttributeConst (ie: __initconst) without const + if ($line !~ /\bconst\b/ && $line =~ /($InitAttributeConst)/) { + my $attr = $1; + ERROR("INIT_ATTRIBUTE", + "Use of $attr requires a separate use of const\n" . $herecurr); + } + # check for spacing round square brackets; allowed: # 1. with a type on the left -- int [] a; # 2. at the beginning of a line for slice initialisers -- [0...10] = 5,
Re: [PATCH] checkpatch: add rules to check init attribute and const defects
Quoted 5 lines · Joe Perches
People get this regularly wrong and it breaks the LTO builds, as it causes a section attribute conflict.
Original-patch-by Andi Kleen <[email protected]>Signed-off-by Joe Perches <[email protected]>
Thanks looks good.
-Andi
Joe Perches
maintainerPATCH v2 1/1 checkpatch: add rules to check init attribute and const defects
People get this regularly wrong and it breaks the LTO builds, as it causes a section attribute conflict.
Add --fix capability too.
---
V2: Move it closer to the other attribute check
and add the --fix options too.
scripts/checkpatch.pl | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-)
scripts/checkpatch.pl +34 -2
@@ -241,8 +241,11 @@ our $Sparse = qr{ __ref| __rcu }x; - -our $InitAttribute = qr{__(?:mem|cpu|dev|net_|)(?:initdata|initconst|init\b)}; +our $InitAttributePrefix = qr{__(?:mem|cpu|dev|net_|)}; +our $InitAttributeData = qr{$InitAttributePrefix(?:initdata\b)}; +our $InitAttributeConst = qr{$InitAttributePrefix(?:initconst\b)}; +our $InitAttributeInit = qr{$InitAttributePrefix(?:init\b)}; +our $InitAttribute = qr{$InitAttributeData|$InitAttributeConst|$InitAttributeInit}; # Notes to $Attribute: # We need \b after 'init' otherwise 'initconst' will cause a false positive in a check
@@ -3751,6 +3754,35 @@ sub string_find_replace { } } +# check for $InitAttributeData (ie: __initdata) with const + if ($line =~ /\bconst\b/ && $line =~ /($InitAttributeData)/) { + my $attr = $1; + $attr =~ /($InitAttributePrefix)(.*)/; + my $attr_prefix = $1; + my $attr_type = $2; + if (ERROR("INIT_ATTRIBUTE", + "Use of const init definition must use ${attr_prefix}initconst\n" . $herecurr) && + $fix) { + $fixed[$linenr - 1] =~ + s/$InitAttributeData/${attr_prefix}initconst/; + } + } + +# check for $InitAttributeConst (ie: __initconst) without const + if ($line !~ /\bconst\b/ && $line =~ /($InitAttributeConst)/) { + my $attr = $1; + if (ERROR("INIT_ATTRIBUTE", + "Use of $attr requires a separate use of const\n" . $herecurr) && + $fix) { + my $lead = $fixed[$linenr - 1] =~ + /(^\+\s*(?:static\s+))/; + $lead = rtrim($1); + $lead = "$lead " if ($lead !~ /^\+$/); + $lead = "${lead}const "; + $fixed[$linenr - 1] =~ s/(^\+\s*(?:static\s+))/$lead/; + } + } + # prefer usleep_range over udelay if ($line =~ /\budelay\s*\(\s*(\d+)\s*\)/) { # ignore udelay's < 10, however
Joe Perches
maintainerPATCH 1/1 treewide: Convert __initdata and __initconst misuses
Hey Andi.
I ran the updated checkpatch tests against the -next tree and get this patch below:
There are slightly suspicious conversions of
from:
static const char *foo __initdata = { "bar", "baz" };
to:
static const char *foo __initconst = { "bar", "baz" };Maybe these should be:
static const char * const foo...
Anyway, here are the conversions:
---
arch/arc/plat-arcfpga/platform.c | 6 +++--- arch/arc/plat-tb10x/tb10x.c | 2 +- arch/arm/kernel/setup.c | 2 +- arch/arm/mach-at91/board-dt-sam9.c | 2 +- arch/arm/mach-at91/board-dt-sama5.c | 2 +- arch/arm/mach-clps711x/board-edb7211.c | 2 +- arch/arm/mach-clps711x/board-p720t.c | 2 +- arch/arm/mach-cns3xxx/core.c | 4 ++-- arch/arm/mach-davinci/board-dm355-evm.c | 2 +- arch/arm/mach-davinci/board-dm355-leopard.c | 2 +- arch/arm/mach-davinci/board-dm365-evm.c | 2 +- arch/arm/mach-davinci/board-tnetv107x-evm.c | 6 +++--- arch/arm/mach-davinci/da850.c | 4 ++-- arch/arm/mach-davinci/da8xx-dt.c | 2 +- arch/arm/mach-exynos/mach-exynos4-dt.c | 2 +- arch/arm/mach-exynos/mach-exynos5-dt.c | 2 +- arch/arm/mach-imx/imx31-dt.c | 2 +- arch/arm/mach-imx/imx51-dt.c | 2 +- arch/arm/mach-imx/mach-imx53.c | 2 +- arch/arm/mach-imx/mach-imx6q.c | 2 +- arch/arm/mach-imx/mach-imx6sl.c | 2 +- arch/arm/mach-imx/mach-vf610.c | 2 +- arch/arm/mach-lpc32xx/phy3250.c | 2 +- arch/arm/mach-mmp/mmp-dt.c | 2 +- arch/arm/mach-mmp/mmp2-dt.c | 2 +- arch/arm/mach-msm/board-dt-8660.c | 2 +- arch/arm/mach-mxs/mach-mxs.c | 2 +- arch/arm/mach-omap2/board-generic.c | 18 ++++++++-------- arch/arm/mach-omap2/vc.c | 2 +- arch/arm/mach-omap2/voltagedomains3xxx_data.c | 2 +- arch/arm/mach-omap2/voltagedomains44xx_data.c | 2 +- arch/arm/mach-omap2/voltagedomains54xx_data.c | 2 +- arch/arm/mach-prima2/common.c | 6 +++--- arch/arm/mach-prima2/l2x0.c | 6 +++--- arch/arm/mach-pxa/pxa-dt.c | 2 +- arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 2 +- arch/arm/mach-shmobile/board-ape6evm-reference.c | 2 +- arch/arm/mach-shmobile/board-ape6evm.c | 2 +- .../board-armadillo800eva-reference.c | 2 +- arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +- arch/arm/mach-shmobile/board-bockw-reference.c | 2 +- arch/arm/mach-shmobile/board-bockw.c | 2 +- arch/arm/mach-shmobile/board-kzm9d-reference.c | 2 +- arch/arm/mach-shmobile/board-kzm9d.c | 2 +- arch/arm/mach-shmobile/board-kzm9g-reference.c | 2 +- arch/arm/mach-shmobile/board-kzm9g.c | 2 +- arch/arm/mach-shmobile/board-lager-reference.c | 2 +- arch/arm/mach-shmobile/board-lager.c | 2 +- arch/arm/mach-shmobile/board-mackerel.c | 2 +- arch/arm/mach-shmobile/board-marzen-reference.c | 2 +- arch/arm/mach-shmobile/board-marzen.c | 2 +- arch/arm/mach-shmobile/setup-emev2.c | 2 +- arch/arm/mach-shmobile/setup-r8a73a4.c | 2 +- arch/arm/mach-shmobile/setup-r8a7740.c | 2 +- arch/arm/mach-shmobile/setup-r8a7778.c | 2 +- arch/arm/mach-shmobile/setup-r8a7779.c | 2 +- arch/arm/mach-shmobile/setup-r8a7790.c | 2 +- arch/arm/mach-shmobile/setup-sh7372.c | 2 +- arch/arm/mach-shmobile/setup-sh73a0.c | 2 +- arch/arm/mach-sti/board-dt.c | 2 +- arch/metag/kernel/machines.c | 2 +- arch/mips/ath79/pci.c | 2 +- arch/powerpc/platforms/52xx/mpc5200_simple.c | 2 +- arch/powerpc/platforms/83xx/mpc830x_rdb.c | 2 +- arch/powerpc/platforms/83xx/mpc831x_rdb.c | 2 +- arch/powerpc/sysdev/xilinx_intc.c | 2 +- drivers/clk/samsung/clk.h | 2 +- drivers/clk/versatile/clk-integrator.c | 2 +- drivers/clk/versatile/clk-realview.c | 4 ++-- drivers/clk/zynq/clkc.c | 24 +++++++++++----------- drivers/cpufreq/ppc-corenet-cpufreq.c | 2 +- drivers/irqchip/irq-bcm2835.c | 10 ++++----- drivers/mmc/host/sdhci-bcm-kona.c | 2 +- drivers/mtd/nand/davinci_nand.c | 4 ++-- drivers/usb/host/ehci-msm.c | 2 +- drivers/usb/host/ehci-omap.c | 2 +- drivers/usb/host/ehci-s5p.c | 2 +- drivers/usb/host/ehci-spear.c | 2 +- 78 files changed, 113 insertions(+), 113 deletions(-)
arch/arc/plat-arcfpga/platform.c +3 -3
@@ -201,7 +201,7 @@ static void __init plat_fpga_populate_dev(void)* callback set, by matching the DT compatible name. */ -static const char *aa4_compat[]__initdata = { +static const char *aa4_compat[]__initconst = {"snps,arc-angel4" ,NULL , };
@@ -216,7 +216,7 @@ MACHINE_START(ANGEL4, "angel4")#endif MACHINE_END -static const char *ml509_compat[] __initdata = { +static const char *ml509_compat[] __initconst = {"snps,arc-ml509" ,NULL , };
@@ -231,7 +231,7 @@ MACHINE_START(ML509, "ml509")#endif MACHINE_END -static const char *nsimosci_compat[] __initdata = { +static const char *nsimosci_compat[] __initconst = {"snps,nsimosci" ,NULL , };
arch/arc/plat-tb10x/tb10x.c +1 -1
@@ -34,7 +34,7 @@ static void __init tb10x_platform_init(void)of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); } -static const char *tb10x_compat[]__initdata = { +static const char *tb10x_compat[]__initconst = {"abilis,arc-tb10x" ,NULL , };
arch/arm/kernel/setup.c +1 -1
@@ -139,7 +139,7 @@ EXPORT_SYMBOL(elf_platform);static const char *cpu_name;static const char *machine_name;static char __initdata cmd_line[COMMAND_LINE_SIZE ]; -const struct machine_desc *machine_desc__initdata ; +const struct machine_desc *machine_desc__initconst ;static union {char c[4 ];unsigned long l; } endian_test__initdata = { {'l' ,'?' ,'?' ,'b' } };#define ENDIANNESS ((char)endian_test.l)
arch/arm/mach-at91/board-dt-sam9.c +1 -1
@@ -42,7 +42,7 @@ static void __init at91_dt_device_init(void)of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); } -static const char *at91_dt_board_compat[]__initdata = { +static const char *at91_dt_board_compat[]__initconst = {"atmel,at91sam9" ,NULL };
arch/arm/mach-at91/board-dt-sama5.c +1 -1
@@ -65,7 +65,7 @@ static void __init sama5_dt_device_init(void)of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); } -static const char *sama5_dt_board_compat[]__initdata = { +static const char *sama5_dt_board_compat[]__initconst = {"atmel,sama5" ,NULL };
arch/arm/mach-clps711x/board-edb7211.c +1 -1
@@ -120,7 +120,7 @@ static struct generic_bl_info edb7211_lcd_backlight_pdata = { .set_bl_intensity = edb7211_lcd_backlight_set_intensity, }; -static struct gpio edb7211_gpios[]__initconst = { +static const struct gpio edb7211_gpios[]__initconst = { {EDB7211_LCD_DC_DC_EN ,GPIOF_OUT_INIT_LOW ,"LCD DC-DC" }, {EDB7211_LCDEN ,GPIOF_OUT_INIT_LOW ,"LCD POWER" }, {EDB7211_LCDBL ,GPIOF_OUT_INIT_LOW ,"LCD BACKLIGHT" },
arch/arm/mach-clps711x/board-p720t.c +1 -1
@@ -155,7 +155,7 @@#define PLD_GPIO1 (PLD_GPIO_MMGPIO_BASE + 1)#define PLD_GPIO0 (PLD_GPIO_MMGPIO_BASE + 0) -static struct gpio p720t_gpios[]__initconst = { +static const struct gpio p720t_gpios[]__initconst = { {PLD_S1_ON ,GPIOF_OUT_INIT_LOW ,"PLD_S1_ON" }, {PLD_S2_ON ,GPIOF_OUT_INIT_LOW ,"PLD_S2_ON" }, {PLD_S3_ON ,GPIOF_OUT_INIT_LOW ,"PLD_S3_ON" },
arch/arm/mach-cns3xxx/core.c +2 -2
@@ -307,7 +307,7 @@ static struct usb_ohci_pdata cns3xxx_usb_ohci_pdata = { .power_off = csn3xxx_usb_power_off, }; -static struct of_dev_auxdata cns3xxx_auxdata[]__initconst = { +static const struct of_dev_auxdata cns3xxx_auxdata[]__initconst = { {"intel,usb-ehci" ,CNS3XXX_USB_BASE ,"ehci-platform" , &cns3xxx_usb_ehci_pdata }, {"intel,usb-ohci" ,CNS3XXX_USB_OHCI_BASE ,"ohci-platform" , &cns3xxx_usb_ohci_pdata }, {"cavium,cns3420-ahci" ,CNS3XXX_SATA2_BASE ,"ahci" ,NULL },
@@ -360,7 +360,7 @@ static void __init cns3xxx_init(void) cns3xxx_auxdata, NULL); } -static const char *cns3xxx_dt_compat[]__initdata = { +static const char *cns3xxx_dt_compat[]__initconst = {"cavium,cns3410" ,"cavium,cns3420" ,NULL ,
arch/arm/mach-davinci/board-dm355-evm.c +1 -1
@@ -361,7 +361,7 @@ static struct spi_eeprom at25640a = { .flags = EE_ADDR2, }; -static struct spi_board_info dm355_evm_spi_info[]__initconst = { +static const struct spi_board_info dm355_evm_spi_info[]__initconst = { { .modalias ="at25" , .platform_data = &at25640a,
arch/arm/mach-davinci/board-dm355-leopard.c +1 -1
@@ -220,7 +220,7 @@ static struct spi_eeprom at25640a = { .flags = EE_ADDR2, }; -static struct spi_board_info dm355_leopard_spi_info[]__initconst = { +static const struct spi_board_info dm355_leopard_spi_info[]__initconst = { { .modalias ="at25" , .platform_data = &at25640a,
arch/arm/mach-davinci/board-dm365-evm.c +1 -1
@@ -730,7 +730,7 @@ static struct spi_eeprom at25640 = { .flags = EE_ADDR2, }; -static struct spi_board_info dm365_evm_spi_info[]__initconst = { +static const struct spi_board_info dm365_evm_spi_info[]__initconst = { { .modalias ="at25" , .platform_data = &at25640,
arch/arm/mach-davinci/board-tnetv107x-evm.c +3 -3
@@ -147,7 +147,7 @@ static struct davinci_nand_pdata nand_config = { .ecc_bits = 1, }; -static struct davinci_uart_config serial_config__initconst = { +static const struct davinci_uart_config serial_config__initconst = { .enabled_uarts =BIT (1 ), };
@@ -245,7 +245,7 @@ static struct ti_ssp_data ssp_config = { }, }; -static struct tnetv107x_device_info evm_device_info__initconst = { +static const struct tnetv107x_device_info evm_device_info__initconst = { .serial_config = &serial_config, .mmc_config[1 ] = &mmc_config,/* controller 1 */ .nand_config[0 ] = &nand_config,/* chip select 0 */
@@ -253,7 +253,7 @@ static struct tnetv107x_device_info evm_device_info __initconst = { .ssp_config = &ssp_config, }; -static struct spi_board_info spi_info[]__initconst = { +static const struct spi_board_info spi_info[]__initconst = { };static __init void tnetv107x_evm_board_init (void )
arch/arm/mach-davinci/da850.c +2 -2
@@ -714,7 +714,7 @@ const short da850_lcdcntl_pins[] __initconst = {-1 }; -const short da850_vpif_capture_pins[]__initdata = { +const short da850_vpif_capture_pins[]__initconst = {DA850_VPIF_DIN0 ,DA850_VPIF_DIN1 ,DA850_VPIF_DIN2 ,DA850_VPIF_DIN3 ,DA850_VPIF_DIN4 ,DA850_VPIF_DIN5 ,DA850_VPIF_DIN6 ,DA850_VPIF_DIN7 ,DA850_VPIF_DIN8 ,DA850_VPIF_DIN9 ,DA850_VPIF_DIN10 ,DA850_VPIF_DIN11 ,
@@ -724,7 +724,7 @@ const short da850_vpif_capture_pins[] __initdata = {-1 }; -const short da850_vpif_display_pins[]__initdata = { +const short da850_vpif_display_pins[]__initconst = {DA850_VPIF_DOUT0 ,DA850_VPIF_DOUT1 ,DA850_VPIF_DOUT2 ,DA850_VPIF_DOUT3 ,DA850_VPIF_DOUT4 ,DA850_VPIF_DOUT5 ,DA850_VPIF_DOUT6 ,DA850_VPIF_DOUT7 ,DA850_VPIF_DOUT8 ,DA850_VPIF_DOUT9 ,DA850_VPIF_DOUT10 ,
arch/arm/mach-davinci/da8xx-dt.c +1 -1
@@ -58,7 +58,7 @@ static void __init da850_init_machine(void) } -static const char *da850_boards_compat[]__initdata = { +static const char *da850_boards_compat[]__initconst = {"enbw,cmc" ,"ti,da850-evm" ,"ti,da850" ,
arch/arm/mach-exynos/mach-exynos4-dt.c +1 -1
@@ -28,7 +28,7 @@ static void __init exynos4_dt_machine_init(void)of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); } -static char const *exynos4_dt_compat[]__initdata = { +static char const *exynos4_dt_compat[]__initconst = {"samsung,exynos4210" ,"samsung,exynos4212" ,"samsung,exynos4412" ,
arch/arm/mach-exynos/mach-exynos5-dt.c +1 -1
@@ -50,7 +50,7 @@ static void __init exynos5_dt_machine_init(void)of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); } -static char const *exynos5_dt_compat[]__initdata = { +static char const *exynos5_dt_compat[]__initconst = {"samsung,exynos5250" ,"samsung,exynos5420" ,"samsung,exynos5440" ,
arch/arm/mach-imx/imx31-dt.c +1 -1
@@ -25,7 +25,7 @@ static void __init imx31_dt_init(void)of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); } -static const char *imx31_dt_board_compat[]__initdata = { +static const char *imx31_dt_board_compat[]__initconst = {"fsl,imx31" ,NULL };
arch/arm/mach-imx/imx51-dt.c +1 -1
@@ -29,7 +29,7 @@ static void __init imx51_dt_init(void)platform_device_register_full (&devinfo); } -static const char *imx51_dt_board_compat[]__initdata = { +static const char *imx51_dt_board_compat[]__initconst = {"fsl,imx51" ,NULL };
arch/arm/mach-imx/mach-imx53.c +1 -1
@@ -31,7 +31,7 @@ static void __init imx53_dt_init(void)of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); } -static const char *imx53_dt_board_compat[]__initdata = { +static const char *imx53_dt_board_compat[]__initconst = {"fsl,imx53" ,NULL };
arch/arm/mach-imx/mach-imx6q.c +1 -1
@@ -296,7 +296,7 @@ static void __init imx6q_timer_init(void) imx6q_revision()); } -static const char *imx6q_dt_compat[]__initdata = { +static const char *imx6q_dt_compat[]__initconst = {"fsl,imx6dl" ,"fsl,imx6q" ,NULL ,
arch/arm/mach-imx/mach-imx6sl.c +1 -1
@@ -57,7 +57,7 @@ static void __init imx6sl_timer_init(void)of_clk_init (NULL ); } -static const char *imx6sl_dt_compat[]__initdata = { +static const char *imx6sl_dt_compat[]__initconst = {"fsl,imx6sl" ,NULL , };
arch/arm/mach-imx/mach-vf610.c +1 -1
@@ -34,7 +34,7 @@ static void __init vf610_init_time(void)clocksource_of_init (); } -static const char *vf610_dt_compat[]__initdata = { +static const char *vf610_dt_compat[]__initconst = {"fsl,vf610" ,NULL , };
arch/arm/mach-lpc32xx/phy3250.c +1 -1
@@ -251,7 +251,7 @@ static void __init lpc3250_machine_init(void) lpc32xx_auxdata_lookup, NULL); } -static char const *lpc32xx_dt_compat[]__initdata = { +static char const *lpc32xx_dt_compat[]__initconst = {"nxp,lpc3220" ,"nxp,lpc3230" ,"nxp,lpc3240" ,
arch/arm/mach-mmp/mmp-dt.c +1 -1
@@ -52,7 +52,7 @@ static void __init pxa910_dt_init(void) pxa910_auxdata_lookup, NULL); } -static const char *mmp_dt_board_compat[]__initdata = { +static const char *mmp_dt_board_compat[]__initconst = {"mrvl,pxa168-aspenite" ,"mrvl,pxa910-dkb" ,NULL ,
arch/arm/mach-mmp/mmp2-dt.c +1 -1
@@ -37,7 +37,7 @@ static void __init mmp2_dt_init(void) mmp2_auxdata_lookup, NULL); } -static const char *mmp2_dt_board_compat[]__initdata = { +static const char *mmp2_dt_board_compat[]__initconst = {"mrvl,mmp2-brownstone" ,NULL , };
arch/arm/mach-msm/board-dt-8660.c +1 -1
@@ -34,7 +34,7 @@ static void __init msm8x60_dt_init(void) msm_auxdata_lookup, NULL); } -static const char *msm8x60_fluid_match[]__initdata = { +static const char *msm8x60_fluid_match[]__initconst = {"qcom,msm8660-fluid" ,"qcom,msm8660-surf" ,NULL
arch/arm/mach-mxs/mach-mxs.c +1 -1
@@ -500,7 +500,7 @@ static void __init mxs_timer_init(void)clocksource_of_init (); } -static const char *mxs_dt_compat[]__initdata = { +static const char *mxs_dt_compat[]__initconst = {"fsl,imx28" ,"fsl,imx23" ,NULL ,
arch/arm/mach-omap2/board-generic.c +9 -9
@@ -73,7 +73,7 @@ static void __init omap_generic_init(void) }#ifdef CONFIG_SOC_OMAP2420 -static const char *omap242x_boards_compat[]__initdata = { +static const char *omap242x_boards_compat[]__initconst = {"ti,omap2420" ,NULL , };
@@ -92,7 +92,7 @@ MACHINE_END#endif #ifdef CONFIG_SOC_OMAP2430 -static const char *omap243x_boards_compat[]__initdata = { +static const char *omap243x_boards_compat[]__initconst = {"ti,omap2430" ,NULL , };
@@ -111,7 +111,7 @@ MACHINE_END#endif #ifdef CONFIG_ARCH_OMAP3 -static const char *omap3_boards_compat[]__initdata = { +static const char *omap3_boards_compat[]__initconst = {"ti,omap3" ,NULL , };
@@ -129,7 +129,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") .restart = omap3xxx_restart,MACHINE_END -static const char *omap3_gp_boards_compat[] __initdata = { +static const char *omap3_gp_boards_compat[] __initconst = {"ti,omap3-beagle" ,"timll,omap3-devkit8000" ,NULL ,
@@ -150,7 +150,7 @@ MACHINE_END#endif #ifdef CONFIG_SOC_AM33XX -static const char *am33xx_boards_compat[]__initdata = { +static const char *am33xx_boards_compat[]__initconst = {"ti,am33xx" ,NULL , };
@@ -169,7 +169,7 @@ MACHINE_END#endif #ifdef CONFIG_ARCH_OMAP4 -static const char *omap4_boards_compat[]__initdata = { +static const char *omap4_boards_compat[]__initconst = {"ti,omap4" ,NULL , };
@@ -189,7 +189,7 @@ MACHINE_END#endif #ifdef CONFIG_SOC_OMAP5 -static const char *omap5_boards_compat[]__initdata = { +static const char *omap5_boards_compat[]__initconst = {"ti,omap5" ,NULL , };
@@ -208,7 +208,7 @@ MACHINE_END#endif #ifdef CONFIG_SOC_AM43XX -static const char *am43_boards_compat[]__initdata = { +static const char *am43_boards_compat[]__initconst = {"ti,am43" ,NULL , };
@@ -224,7 +224,7 @@ MACHINE_END#endif #ifdef CONFIG_SOC_DRA7XX -static const char *dra7xx_boards_compat[]__initdata = { +static const char *dra7xx_boards_compat[]__initconst = {"ti,dra7" ,NULL , };
arch/arm/mach-omap2/vc.c +1 -1
@@ -482,7 +482,7 @@ struct i2c_init_data {u8 hsscll_12; }; -static const __initdata struct i2c_init_data omap4_i2c_timing_data[] = { +static const struct i2c_init_data omap4_i2c_timing_data[]__initconst = { { .load =50 , .loadbits =0x3 ,
arch/arm/mach-omap2/voltagedomains3xxx_data.c +1 -1
@@ -95,7 +95,7 @@ static struct voltagedomain *voltagedomains_am35xx[] __initdata = { }; -static const char *sys_clk_name__initdata ="sys_ck" ; +static const char *sys_clk_name__initconst ="sys_ck" ;void __init omap3xxx_voltagedomains_init (void ) {
arch/arm/mach-omap2/voltagedomains44xx_data.c +1 -1
@@ -92,7 +92,7 @@ static struct voltagedomain *voltagedomains_omap4[] __initdata = { NULL, }; -static const char *sys_clk_name__initdata ="sys_clkin_ck" ; +static const char *sys_clk_name__initconst ="sys_clkin_ck" ;void __init omap44xx_voltagedomains_init (void ) {
arch/arm/mach-omap2/voltagedomains54xx_data.c +1 -1
@@ -78,7 +78,7 @@ static struct voltagedomain *voltagedomains_omap5[] __initdata = { NULL, }; -static const char *sys_clk_name__initdata ="sys_clkin" ; +static const char *sys_clk_name__initconst ="sys_clkin" ;void __init omap54xx_voltagedomains_init (void ) {
arch/arm/mach-prima2/common.c +3 -3
@@ -35,7 +35,7 @@ static __init void sirfsoc_map_io(void) }#ifdef CONFIG_ARCH_ATLAS6 -static const char *atlas6_dt_match[]__initdata = { +static const char *atlas6_dt_match[]__initconst = {"sirf,atlas6" ,NULL };
@@ -51,7 +51,7 @@ MACHINE_END#endif #ifdef CONFIG_ARCH_PRIMA2 -static const char *prima2_dt_match[]__initdata = { +static const char *prima2_dt_match[]__initconst = {"sirf,prima2" ,NULL };
@@ -68,7 +68,7 @@ MACHINE_END#endif #ifdef CONFIG_ARCH_MARCO -static const char *marco_dt_match[]__initdata = { +static const char *marco_dt_match[]__initconst = {"sirf,marco" ,NULL };
arch/arm/mach-prima2/l2x0.c +3 -3
@@ -17,18 +17,18 @@ struct l2x0_auxu32 mask; }; -static struct l2x0_aux prima2_l2x0_aux__initconst = { +static const struct l2x0_aux prima2_l2x0_aux__initconst = { .val =2 <<L2X0_AUX_CTRL_WAY_SIZE_SHIFT , .mask =0 , }; -static struct l2x0_aux marco_l2x0_aux__initconst = { +static const struct l2x0_aux marco_l2x0_aux__initconst = { .val = (2 <<L2X0_AUX_CTRL_WAY_SIZE_SHIFT ) | (1 <<L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT ), .mask =L2X0_AUX_CTRL_MASK , }; -static struct of_device_id sirf_l2x0_ids[]__initconst = { +static const struct of_device_id sirf_l2x0_ids[]__initconst = { { .compatible ="sirf,prima2-pl310-cache" , .data = &prima2_l2x0_aux, }, { .compatible ="sirf,marco-pl310-cache" , .data = &marco_l2x0_aux, }, {},
arch/arm/mach-pxa/pxa-dt.c +1 -1
@@ -42,7 +42,7 @@ static void __init pxa3xx_dt_init(void) pxa3xx_auxdata_lookup, NULL); } -static const char *pxa3xx_dt_board_compat[]__initdata = { +static const char *pxa3xx_dt_board_compat[]__initconst = {"marvell,pxa300" ,"marvell,pxa310" ,"marvell,pxa320" ,
arch/arm/mach-s3c24xx/mach-s3c2416-dt.c +1 -1
@@ -74,7 +74,7 @@ static void __init s3c2416_dt_machine_init(void)s3c_pm_init (); } -static char const *s3c2416_dt_compat[]__initdata = { +static char const *s3c2416_dt_compat[]__initconst = {"samsung,s3c2416" ,"samsung,s3c2450" ,NULL
arch/arm/mach-shmobile/board-ape6evm-reference.c +1 -1
@@ -51,7 +51,7 @@ static void __init ape6evm_add_standard_devices(void)platform_device_register_simple ("cpufreq-cpu0" ,-1 ,NULL ,0 ); } -static const char *ape6evm_boards_compat_dt[]__initdata = { +static const char *ape6evm_boards_compat_dt[]__initconst = {"renesas,ape6evm-reference" ,NULL , };
arch/arm/mach-shmobile/board-ape6evm.c +1 -1
@@ -234,7 +234,7 @@ static void __init ape6evm_add_standard_devices(void) sizeof(ape6evm_leds_pdata)); } -static const char *ape6evm_boards_compat_dt[]__initdata = { +static const char *ape6evm_boards_compat_dt[]__initconst = {"renesas,ape6evm" ,NULL , };
arch/arm/mach-shmobile/board-armadillo800eva-reference.c +1 -1
@@ -180,7 +180,7 @@ static void eva_restart(enum reboot_mode mode, const char *cmd)writel (1 <<31 ,RESCNT2 ); } -static const char *eva_boards_compat_dt[]__initdata = { +static const char *eva_boards_compat_dt[]__initconst = {"renesas,armadillo800eva-reference" ,NULL , };
arch/arm/mach-shmobile/board-armadillo800eva.c +1 -1
@@ -1305,7 +1305,7 @@ static void eva_restart(enum reboot_mode mode, const char *cmd)writel ((1 <<31 ),RESCNT2 ); } -static const char *eva_boards_compat_dt[]__initdata = { +static const char *eva_boards_compat_dt[]__initconst = {"renesas,armadillo800eva" ,NULL , };
arch/arm/mach-shmobile/board-bockw-reference.c +1 -1
@@ -48,7 +48,7 @@ static void __init bockw_init(void)of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); } -static const char *bockw_boards_compat_dt[]__initdata = { +static const char *bockw_boards_compat_dt[]__initconst = {"renesas,bockw-reference" ,NULL , };
arch/arm/mach-shmobile/board-bockw.c +1 -1
@@ -310,7 +310,7 @@ static void __init bockw_init(void) } } -static const char *bockw_boards_compat_dt[]__initdata = { +static const char *bockw_boards_compat_dt[]__initconst = {"renesas,bockw" ,NULL , };
arch/arm/mach-shmobile/board-kzm9d-reference.c +1 -1
@@ -32,7 +32,7 @@ static void __init kzm9d_add_standard_devices(void)of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); } -static const char *kzm9d_boards_compat_dt[]__initdata = { +static const char *kzm9d_boards_compat_dt[]__initconst = {"renesas,kzm9d-reference" ,NULL , };
arch/arm/mach-shmobile/board-kzm9d.c +1 -1
@@ -77,7 +77,7 @@ void __init kzm9d_add_standard_devices(void)platform_add_devices (kzm9d_devices,ARRAY_SIZE (kzm9d_devices)); } -static const char *kzm9d_boards_compat_dt[]__initdata = { +static const char *kzm9d_boards_compat_dt[]__initconst = {"renesas,kzm9d" ,NULL , };
arch/arm/mach-shmobile/board-kzm9g-reference.c +1 -1
@@ -41,7 +41,7 @@ static void __init kzm_init(void)#endif } -static const char *kzm9g_boards_compat_dt[]__initdata = { +static const char *kzm9g_boards_compat_dt[]__initconst = {"renesas,kzm9g-reference" ,NULL , };
arch/arm/mach-shmobile/board-kzm9g.c +1 -1
@@ -898,7 +898,7 @@ static void kzm9g_restart(enum reboot_mode mode, const char *cmd)writel ((1 <<31 ),RESCNT2 ); } -static const char *kzm9g_boards_compat_dt[]__initdata = { +static const char *kzm9g_boards_compat_dt[]__initconst = {"renesas,kzm9g" ,NULL , };
arch/arm/mach-shmobile/board-lager-reference.c +1 -1
@@ -32,7 +32,7 @@ static void __init lager_add_standard_devices(void)of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); } -static const char *lager_boards_compat_dt[]__initdata = { +static const char *lager_boards_compat_dt[]__initconst = {"renesas,lager-reference" ,NULL , };
arch/arm/mach-shmobile/board-lager.c +1 -1
@@ -155,7 +155,7 @@ static void __init lager_add_standard_devices(void) ðer_pdata, sizeof(ether_pdata)); } -static const char *lager_boards_compat_dt[]__initdata = { +static const char *lager_boards_compat_dt[]__initconst = {"renesas,lager" ,NULL , };
arch/arm/mach-shmobile/board-mackerel.c +1 -1
@@ -1505,7 +1505,7 @@ static void __init mackerel_init(void)pm_clk_add (&hdmi_lcdc_device.dev,"hdmi" ); } -static const char *mackerel_boards_compat_dt[]__initdata = { +static const char *mackerel_boards_compat_dt[]__initconst = {"renesas,mackerel" ,NULL , };
arch/arm/mach-shmobile/board-marzen-reference.c +1 -1
@@ -30,7 +30,7 @@ static void __init marzen_init(void)r8a7779_add_standard_devices_dt (); } -static const char *marzen_boards_compat_dt[]__initdata = { +static const char *marzen_boards_compat_dt[]__initconst = {"renesas,marzen-reference" ,NULL , };
arch/arm/mach-shmobile/board-marzen.c +1 -1
@@ -299,7 +299,7 @@ static void __init marzen_init(void)platform_add_devices (marzen_devices,ARRAY_SIZE (marzen_devices)); } -static const char *marzen_boards_compat_dt[]__initdata = { +static const char *marzen_boards_compat_dt[]__initconst = {"renesas,marzen" ,NULL , };
arch/arm/mach-shmobile/setup-emev2.c +1 -1
@@ -197,7 +197,7 @@ void __init emev2_init_delay(void)#ifdef CONFIG_USE_OF -static const char *emev2_boards_compat_dt[]__initdata = { +static const char *emev2_boards_compat_dt[]__initconst = {"renesas,emev2" ,NULL , };
arch/arm/mach-shmobile/setup-r8a73a4.c +1 -1
@@ -216,7 +216,7 @@ void __init r8a73a4_init_delay(void)#ifdef CONFIG_USE_OF -static const char *r8a73a4_boards_compat_dt[]__initdata = { +static const char *r8a73a4_boards_compat_dt[]__initconst = {"renesas,r8a73a4" ,NULL , };
arch/arm/mach-shmobile/setup-r8a7740.c +1 -1
@@ -1057,7 +1057,7 @@ static void __init r8a7740_generic_init(void)r8a7740_add_standard_devices_dt (); } -static const char *r8a7740_boards_compat_dt[]__initdata = { +static const char *r8a7740_boards_compat_dt[]__initconst = {"renesas,r8a7740" ,NULL , };
arch/arm/mach-shmobile/setup-r8a7778.c +1 -1
@@ -432,7 +432,7 @@ void __init r8a7778_init_irq_dt(void)iounmap (base); } -static const char *r8a7778_compat_dt[]__initdata = { +static const char *r8a7778_compat_dt[]__initconst = {"renesas,r8a7778" ,NULL , };
arch/arm/mach-shmobile/setup-r8a7779.c +1 -1
@@ -773,7 +773,7 @@ void __init r8a7779_add_standard_devices_dt(void)of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); } -static const char *r8a7779_compat_dt[]__initdata = { +static const char *r8a7779_compat_dt[]__initconst = {"renesas,r8a7779" ,NULL , };
arch/arm/mach-shmobile/setup-r8a7790.c +1 -1
@@ -276,7 +276,7 @@ void __init r8a7790_init_delay(void)#ifdef CONFIG_USE_OF -static const char *r8a7790_boards_compat_dt[]__initdata = { +static const char *r8a7790_boards_compat_dt[]__initconst = {"renesas,r8a7790" ,NULL , };
arch/arm/mach-shmobile/setup-sh7372.c +1 -1
@@ -1157,7 +1157,7 @@ void __init sh7372_add_standard_devices_dt(void)of_platform_populate (NULL , of_default_bus_match_table,NULL ,NULL ); } -static const char *sh7372_boards_compat_dt[]__initdata = { +static const char *sh7372_boards_compat_dt[]__initconst = {"renesas,sh7372" ,NULL , };
arch/arm/mach-shmobile/setup-sh73a0.c +1 -1
@@ -958,7 +958,7 @@ void __init sh73a0_add_standard_devices_dt(void)platform_device_register_full (&devinfo); } -static const char *sh73a0_boards_compat_dt[]__initdata = { +static const char *sh73a0_boards_compat_dt[]__initconst = {"renesas,sh73a0" ,NULL , };
arch/arm/mach-sti/board-dt.c +1 -1
@@ -35,7 +35,7 @@ static void __init stih41x_timer_init(void)stih41x_l2x0_init (); } -static const char *stih41x_dt_match[]__initdata = { +static const char *stih41x_dt_match[]__initconst = {"st,stih415" ,"st,stih416" ,NULL
arch/metag/kernel/machines.c +1 -1
@@ -10,7 +10,7 @@#include <asm/irq.h> #include <asm/mach/arch.h> -static const char *meta_boards_compat[]__initdata = { +static const char *meta_boards_compat[]__initconst = {"img,meta" ,NULL , };
arch/mips/ath79/pci.c +1 -1
@@ -22,7 +22,7 @@#include "pci.h" static int (*ath79_pci_plat_dev_init)(struct pci_dev *dev); -static const struct ath79_pci_irq *ath79_pci_irq_map__initdata ; +static const struct ath79_pci_irq *ath79_pci_irq_map__initconst ;static unsigned ath79_pci_nr_irqs__initdata ;static const struct ath79_pci_irq ar71xx_pci_irq_map[]__initconst = {
arch/powerpc/platforms/52xx/mpc5200_simple.c +1 -1
@@ -49,7 +49,7 @@ static void __init mpc5200_simple_setup_arch(void) }/* list of the supported boards */ -static const char *board[]__initdata = { +static const char *board[]__initconst = {"anonymous,a3m071" ,"anonymous,a4m072" ,"anon,charon" ,
arch/powerpc/platforms/83xx/mpc830x_rdb.c +1 -1
@@ -34,7 +34,7 @@ static void __init mpc830x_rdb_setup_arch(void)mpc831x_usb_cfg (); } -static const char *board[]__initdata = { +static const char *board[]__initconst = {"MPC8308RDB" ,"fsl,mpc8308rdb" ,"denx,mpc8308_p1m" ,
arch/powerpc/platforms/83xx/mpc831x_rdb.c +1 -1
@@ -35,7 +35,7 @@ static void __init mpc831x_rdb_setup_arch(void)mpc831x_usb_cfg (); } -static const char *board[]__initdata = { +static const char *board[]__initconst = {"MPC8313ERDB" ,"fsl,mpc8315erdb" ,NULL
arch/powerpc/sysdev/xilinx_intc.c +1 -1
@@ -263,7 +263,7 @@ static void __init xilinx_i8259_setup_cascade(void)static inline void xilinx_i8259_setup_cascade (void ) {return ; }#endif /* defined(CONFIG_PPC_I8259) */ -static struct of_device_id xilinx_intc_match[]__initconst = { +static const struct of_device_id xilinx_intc_match[]__initconst = { { .compatible ="xlnx,opb-intc-1.00.c" , }, { .compatible ="xlnx,xps-intc-1.00.a" , }, {}
drivers/clk/samsung/clk.h +1 -1
@@ -252,7 +252,7 @@ struct samsung_gate_clock {#define GATE_DA (_id, dname, cname, pname, o, b, f, gf, a) \ __GATE(_id, dname, cname, pname, o, b, f, gf, a) -#define PNAME (x) static const char *x[] __initdata +#define PNAME (x) static const char *x[] __initconst/** * struct samsung_clk_reg_dump: register dump of clock controller registers.
drivers/clk/versatile/clk-integrator.c +1 -1
@@ -35,7 +35,7 @@ static const struct icst_params cp_auxvco_params = { .idx2s = icst525_idx2s, }; -static const struct clk_icst_desc __initdata cp_icst_desc = { +static const struct clk_icst_desc cp_icst_desc__initconst = { .params = &cp_auxvco_params, .vco_offset =0x1c , .lock_offset =INTEGRATOR_HDR_LOCK_OFFSET ,
drivers/clk/versatile/clk-realview.c +2 -2
@@ -33,13 +33,13 @@ static const struct icst_params realview_oscvco_params = { .idx2s = icst307_idx2s, }; -static const struct clk_icst_desc __initdata realview_osc0_desc = { +static const struct clk_icst_desc realview_osc0_desc__initconst = { .params = &realview_oscvco_params, .vco_offset =REALVIEW_SYS_OSC0_OFFSET , .lock_offset =REALVIEW_SYS_LOCK_OFFSET , }; -static const struct clk_icst_desc __initdata realview_osc4_desc = { +static const struct clk_icst_desc realview_osc4_desc__initconst = { .params = &realview_oscvco_params, .vco_offset =REALVIEW_SYS_OSC4_OFFSET , .lock_offset =REALVIEW_SYS_LOCK_OFFSET ,
drivers/clk/zynq/clkc.c +12 -12
@@ -83,22 +83,22 @@ static DEFINE_SPINLOCK(aperclk_lock);static const char dummy_nm[]__initconst ="dummy_name" ; -static const char *armpll_parents[]__initdata = {"armpll_int" ,"ps_clk" }; -static const char *ddrpll_parents[]__initdata = {"ddrpll_int" ,"ps_clk" }; -static const char *iopll_parents[]__initdata = {"iopll_int" ,"ps_clk" }; -static const char *gem0_mux_parents[]__initdata = {"gem0_div1" , dummy_nm}; -static const char *gem1_mux_parents[]__initdata = {"gem1_div1" , dummy_nm}; -static const char *can0_mio_mux2_parents[]__initdata = {"can0_gate" , +static const char *armpll_parents[]__initconst = {"armpll_int" ,"ps_clk" }; +static const char *ddrpll_parents[]__initconst = {"ddrpll_int" ,"ps_clk" }; +static const char *iopll_parents[]__initconst = {"iopll_int" ,"ps_clk" }; +static const char *gem0_mux_parents[]__initconst = {"gem0_div1" , dummy_nm}; +static const char *gem1_mux_parents[]__initconst = {"gem1_div1" , dummy_nm}; +static const char *can0_mio_mux2_parents[]__initconst = {"can0_gate" ,"can0_mio_mux" }; -static const char *can1_mio_mux2_parents[]__initdata = {"can1_gate" , +static const char *can1_mio_mux2_parents[]__initconst = {"can1_gate" ,"can1_mio_mux" }; -static const char *dbg_emio_mux_parents[]__initdata = {"dbg_div" , +static const char *dbg_emio_mux_parents[]__initconst = {"dbg_div" , dummy_nm}; -static const char *dbgtrc_emio_input_names[]__initdata = {"trace_emio_clk" }; -static const char *gem0_emio_input_names[]__initdata = {"gem0_emio_clk" }; -static const char *gem1_emio_input_names[]__initdata = {"gem1_emio_clk" }; -static const char *swdt_ext_clk_input_names[]__initdata = {"swdt_ext_clk" }; +static const char *dbgtrc_emio_input_names[]__initconst = {"trace_emio_clk" }; +static const char *gem0_emio_input_names[]__initconst = {"gem0_emio_clk" }; +static const char *gem1_emio_input_names[]__initconst = {"gem1_emio_clk" }; +static const char *swdt_ext_clk_input_names[]__initconst = {"swdt_ext_clk" }; static void __init zynq_clk_register_fclk(enum zynq_clk fclk, const char *clk_name, void __iomem *fclk_ctrl_reg,
drivers/cpufreq/ppc-corenet-cpufreq.c +1 -1
@@ -309,7 +309,7 @@ static struct cpufreq_driver ppc_corenet_cpufreq_driver = { .attr = corenet_cpufreq_attr, }; -static const struct of_device_id node_matches[]__initdata = { +static const struct of_device_id node_matches[]__initconst = { { .compatible ="fsl,p2041-clockgen" , .data = &sdata[0 ], }, { .compatible ="fsl,p3041-clockgen" , .data = &sdata[0 ], }, { .compatible ="fsl,p5020-clockgen" , .data = &sdata[1 ], },
drivers/irqchip/irq-bcm2835.c +5 -5
@@ -74,10 +74,10 @@#define NR_BANKS 3#define IRQS_PER_BANK 32 -static int reg_pending[]__initconst = {0x00 ,0x04 ,0x08 }; -static int reg_enable[]__initconst = {0x18 ,0x10 ,0x14 }; -static int reg_disable[]__initconst = {0x24 ,0x1c ,0x20 }; -static int bank_irqs[]__initconst = {8 ,32 ,32 }; +static const int reg_pending[]__initconst = {0x00 ,0x04 ,0x08 }; +static const int reg_enable[]__initconst = {0x18 ,0x10 ,0x14 }; +static const int reg_disable[]__initconst = {0x24 ,0x1c ,0x20 }; +static const int bank_irqs[]__initconst = {8 ,32 ,32 };static const int shortcuts[] = {7 ,9 ,10 ,18 ,19 ,/* Bank 1 */
@@ -167,7 +167,7 @@ static int __init armctrl_of_init(struct device_node *node,return 0 ; } -static struct of_device_id irq_of_match[]__initconst = { +static const struct of_device_id irq_of_match[]__initconst = { { .compatible ="brcm,bcm2835-armctrl-ic" , .data = armctrl_of_init }, { } };
drivers/mmc/host/sdhci-bcm-kona.c +1 -1
@@ -220,7 +220,7 @@ static struct sdhci_pltfm_data sdhci_pltfm_data_kona = { SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN, }; -static struct __initconst of_device_id sdhci_bcm_kona_of_match[] = { +static const struct __initconst of_device_id sdhci_bcm_kona_of_match[] = { { .compatible ="brcm,kona-sdhci" }, { .compatible ="bcm,kona-sdhci" },/* deprecated name */ {}
drivers/mtd/nand/davinci_nand.c +2 -2
@@ -487,7 +487,7 @@ static int nand_davinci_dev_ready(struct mtd_info *mtd)* ten ECC bytes plus the manufacturer's bad block marker byte, and * and not overlapping the default BBT markers. */ -static struct nand_ecclayout hwecc4_small__initconst = { +static const struct nand_ecclayout hwecc4_small__initconst = { .eccbytes =10 , .eccpos = {0 ,1 ,2 ,3 ,4 ,/* offset 5 holds the badblock marker */
@@ -503,7 +503,7 @@ static struct nand_ecclayout hwecc4_small __initconst = {* storing ten ECC bytes plus the manufacturer's bad block marker byte, * and not overlapping the default BBT markers. */ -static struct nand_ecclayout hwecc4_2048__initconst = { +static const struct nand_ecclayout hwecc4_2048__initconst = { .eccbytes =40 , .eccpos = {/* at the end of spare sector */
drivers/usb/host/ehci-msm.c +1 -1
@@ -195,7 +195,7 @@ static struct platform_driver ehci_msm_driver = { }, }; -static const struct ehci_driver_overrides msm_overrides__initdata = { +static const struct ehci_driver_overrides msm_overrides__initconst = { .reset = ehci_msm_reset, };
drivers/usb/host/ehci-omap.c +1 -1
@@ -86,7 +86,7 @@ static inline u32 ehci_read(void __iomem *base, u32 reg)static struct hc_driver __read_mostly ehci_omap_hc_driver; -static const struct ehci_driver_overrides ehci_omap_overrides__initdata = { +static const struct ehci_driver_overrides ehci_omap_overrides__initconst = { .extra_priv_size =sizeof (struct omap_hcd ), };
drivers/usb/host/ehci-s5p.c +1 -1
@@ -297,7 +297,7 @@ static struct platform_driver s5p_ehci_driver = { .of_match_table = of_match_ptr(exynos_ehci_match), } }; -static const struct ehci_driver_overrides s5p_overrides__initdata = { +static const struct ehci_driver_overrides s5p_overrides__initconst = { .extra_priv_size =sizeof (struct s5p_ehci_hcd ), };
drivers/usb/host/ehci-spear.c +1 -1
@@ -174,7 +174,7 @@ static struct platform_driver spear_ehci_hcd_driver = { } }; -static const struct ehci_driver_overrides spear_overrides__initdata = { +static const struct ehci_driver_overrides spear_overrides__initconst = { .extra_priv_size =sizeof (struct spear_ehci ), };