[U-Boot] [PATCH 1/3] video: ivybridge_igd: Fix compiler warning

Fix build warning in drivers/video/ivybridge_igd.c with gcc 7.3.0:
warning: 'ivb_pm_gt2' defined but not used [-Wunused-const-variable=]
Signed-off-by: Bin Meng bmeng.cn@gmail.com ---
drivers/video/ivybridge_igd.c | 56 ------------------------------------------- 1 file changed, 56 deletions(-)
diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c index d8af2e1..7c00c40 100644 --- a/drivers/video/ivybridge_igd.c +++ b/drivers/video/ivybridge_igd.c @@ -128,62 +128,6 @@ static const struct gt_powermeter ivb_pm_gt1[] = { { 0 } };
-static const struct gt_powermeter ivb_pm_gt2[] = { - { 0xa800, 0x10000000 }, - { 0xa804, 0x00033800 }, - { 0xa808, 0x00000902 }, - { 0xa80c, 0x0c002f00 }, - { 0xa810, 0x12000400 }, - { 0xa814, 0x00000000 }, - { 0xa818, 0x00d20800 }, - { 0xa81c, 0x00000002 }, - { 0xa820, 0x03004b02 }, - { 0xa824, 0x00000600 }, - { 0xa828, 0x07000773 }, - { 0xa82c, 0x00000000 }, - { 0xa830, 0x00010032 }, - { 0xa834, 0x1520040d }, - { 0xa838, 0x00020105 }, - { 0xa83c, 0x00083700 }, - { 0xa840, 0x0000151d }, - { 0xa844, 0x00000000 }, - { 0xa848, 0x20001b00 }, - { 0xa84c, 0x0a000010 }, - { 0xa850, 0x00000000 }, - { 0xa854, 0x00000008 }, - { 0xa858, 0x00000008 }, - { 0xa85c, 0x00000000 }, - { 0xa860, 0x00020000 }, - { 0xa248, 0x0000221e }, - { 0xa900, 0x00000000 }, - { 0xa904, 0x00003500 }, - { 0xa908, 0x00000000 }, - { 0xa90c, 0x0c000000 }, - { 0xa910, 0x12000500 }, - { 0xa914, 0x00000000 }, - { 0xa918, 0x00b20000 }, - { 0xa91c, 0x00000000 }, - { 0xa920, 0x08004b02 }, - { 0xa924, 0x00000200 }, - { 0xa928, 0x07000820 }, - { 0xa92c, 0x00000000 }, - { 0xa930, 0x00030000 }, - { 0xa934, 0x050f020d }, - { 0xa938, 0x00020300 }, - { 0xa93c, 0x00903900 }, - { 0xa940, 0x00000000 }, - { 0xa944, 0x00000000 }, - { 0xa948, 0x20001b00 }, - { 0xa94c, 0x0a000010 }, - { 0xa950, 0x00000000 }, - { 0xa954, 0x00000008 }, - { 0xa960, 0x00110000 }, - { 0xaa3c, 0x00003900 }, - { 0xaa54, 0x00000008 }, - { 0xaa60, 0x00110000 }, - { 0 } -}; - static const struct gt_powermeter ivb_pm_gt2_17w[] = { { 0xa800, 0x20000000 }, { 0xa804, 0x000e3800 },

Fix build warning in arch/arm/mach-omap2/emif-common.c and arch/arm/mach-omap2/omap4/emif.c with gcc 7.3.0:
warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
Signed-off-by: Bin Meng bmeng.cn@gmail.com ---
arch/arm/mach-omap2/emif-common.c | 2 +- arch/arm/mach-omap2/omap4/emif.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/emif-common.c b/arch/arm/mach-omap2/emif-common.c index e3ef37b..d6c56b0 100644 --- a/arch/arm/mach-omap2/emif-common.c +++ b/arch/arm/mach-omap2/emif-common.c @@ -599,7 +599,7 @@ s8 addressing_table_index(u8 type, u8 density, u8 width) * tables of the device using DDR clock frequency */ static const struct lpddr2_ac_timings *get_timings_table(const struct - lpddr2_ac_timings const *const *device_timings, + lpddr2_ac_timings *const *device_timings, u32 freq) { u32 i, temp, freq_nearest; diff --git a/arch/arm/mach-omap2/omap4/emif.c b/arch/arm/mach-omap2/omap4/emif.c index 403c3c6..8f20b1c 100644 --- a/arch/arm/mach-omap2/omap4/emif.c +++ b/arch/arm/mach-omap2/omap4/emif.c @@ -90,8 +90,7 @@ static const struct lpddr2_min_tck min_tck_jedec = { .tFAW = 8 };
-static const struct lpddr2_ac_timings const* - jedec_ac_timings[MAX_NUM_SPEEDBINS] = { +static const struct lpddr2_ac_timings *jedec_ac_timings[MAX_NUM_SPEEDBINS] = { &timings_jedec_200_mhz, &timings_jedec_400_mhz };

On Mon, Feb 12, 2018 at 05:54:36PM +0800, Bin Meng wrote:
Fix build warning in arch/arm/mach-omap2/emif-common.c and arch/arm/mach-omap2/omap4/emif.c with gcc 7.3.0:
warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
Signed-off-by: Bin Meng bmeng.cn@gmail.com
Reviewed-by: Tom Rini trini@konsulko.com

On Mon, Feb 12, 2018 at 05:54:36PM +0800, Bin Meng wrote:
Fix build warning in arch/arm/mach-omap2/emif-common.c and arch/arm/mach-omap2/omap4/emif.c with gcc 7.3.0:
warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier]
Signed-off-by: Bin Meng bmeng.cn@gmail.com Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!

Fix build warning in arch/microblaze/lib/bootm.c with gcc 7.3.0:
warning: this 'if' clause does not guard... [-Wmisleading-indentation]
Signed-off-by: Bin Meng bmeng.cn@gmail.com ---
arch/microblaze/lib/bootm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index 0a286e8..93525cc 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -62,11 +62,12 @@ int do_bootm_linux(int flag, int argc, char * const argv[], of_flat_tree = (char *)simple_strtoul(argv[1], NULL, 16);
/* fixup the initrd now that we know where it should be */ - if (images->rd_start && images->rd_end && of_flat_tree) + if (images->rd_start && images->rd_end && of_flat_tree) { ret = fdt_initrd(of_flat_tree, images->rd_start, images->rd_end); if (ret) return 1; + }
#ifdef DEBUG printf("## Transferring control to Linux (at address 0x%08lx) ",

On Mon, Feb 12, 2018 at 05:54:37PM +0800, Bin Meng wrote:
Fix build warning in arch/microblaze/lib/bootm.c with gcc 7.3.0:
warning: this 'if' clause does not guard... [-Wmisleading-indentation]
Signed-off-by: Bin Meng bmeng.cn@gmail.com
Reviewed-by: Tom Rini trini@konsulko.com

On 12.2.2018 15:46, Tom Rini wrote:
On Mon, Feb 12, 2018 at 05:54:37PM +0800, Bin Meng wrote:
Fix build warning in arch/microblaze/lib/bootm.c with gcc 7.3.0:
warning: this 'if' clause does not guard... [-Wmisleading-indentation]
Signed-off-by: Bin Meng bmeng.cn@gmail.com
Reviewed-by: Tom Rini trini@konsulko.com
Reviewed-by: Michal Simek michal.simek@xilinx.com
If you want me to apply via my tree, I am happy to do that. You have sent it as series that's why I am asking.
Thanks, Michal

On Mon, Feb 12, 2018 at 05:54:37PM +0800, Bin Meng wrote:
Fix build warning in arch/microblaze/lib/bootm.c with gcc 7.3.0:
warning: this 'if' clause does not guard... [-Wmisleading-indentation]
Signed-off-by: Bin Meng bmeng.cn@gmail.com Reviewed-by: Tom Rini trini@konsulko.com Reviewed-by: Michal Simek michal.simek@xilinx.com
Applied to u-boot/master, thanks!

On Mon, Feb 12, 2018 at 05:54:35PM +0800, Bin Meng wrote:
Fix build warning in drivers/video/ivybridge_igd.c with gcc 7.3.0:
warning: 'ivb_pm_gt2' defined but not used [-Wunused-const-variable=]
Signed-off-by: Bin Meng bmeng.cn@gmail.com
Since it's also what I sent, code-wise:
Reviewed-by: Tom Rini trini@konsulko.com
:)

On Mon, Feb 12, 2018 at 10:46 PM, Tom Rini trini@konsulko.com wrote:
On Mon, Feb 12, 2018 at 05:54:35PM +0800, Bin Meng wrote:
Fix build warning in drivers/video/ivybridge_igd.c with gcc 7.3.0:
warning: 'ivb_pm_gt2' defined but not used [-Wunused-const-variable=]
Signed-off-by: Bin Meng bmeng.cn@gmail.com
Since it's also what I sent, code-wise:
Oops, I missed the one you sent before.
Feel free to apply anyone you like :)
Reviewed-by: Tom Rini trini@konsulko.com
Regards, Bin

On Mon, Feb 12, 2018 at 05:54:35PM +0800, Bin Meng wrote:
Fix build warning in drivers/video/ivybridge_igd.c with gcc 7.3.0:
warning: 'ivb_pm_gt2' defined but not used [-Wunused-const-variable=]
Signed-off-by: Bin Meng bmeng.cn@gmail.com Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (3)
-
Bin Meng
-
Michal Simek
-
Tom Rini