Skip to contentSkip to conversation

fsl_i2c.c: Fix warning on gcc-6.x

PATCH In review Tom Rini 2 participants 4 messages Feb 9, 2017 – Feb 17, 2017 I2C

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 fsl_i2c.c: Fix warning on gcc-6.x

With gcc-6.x we see:
drivers/i2c/fsl_i2c.c:86:3: warning: ?fsl_i2c_speed_map? defined but not used [-Wunused-const-variable=]

The easy way to fix this is that since we only use fsl_i2c_speed_map at all on __M68K__ move the existing guards around slightly.

---
 drivers/i2c/fsl_i2c.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/i2c/fsl_i2c.c +2 -2
index e9fbf828f34b..a1406baa87b2 100644
@@ -53,6 +53,7 @@ static const struct fsl_i2c_base *i2c_base[4] = {
 
 /* I2C speed map for a DFSR value of 1 */
 
+#ifdef __M68K__
 /*
  * Map I2C frequency dividers to FDR and DFSR values
  *
@@ -84,7 +85,6 @@ static const struct {
 	unsigned short divider;
 	u8 fdr;
 } fsl_i2c_speed_map[] = {
-#ifdef __M68K__
 	{20, 32}, {22, 33}, {24, 34}, {26, 35},
 	{28, 0}, {28, 36}, {30, 1}, {32, 37},
 	{34, 2}, {36, 38}, {40, 3}, {40, 39},
@@ -102,8 +102,8 @@ static const struct {
 	{1536, 61}, {1792, 62}, {1920, 27}, {2048, 63},
 	{2304, 28}, {2560, 29}, {3072, 30}, {3840, 31},
 	{-1, 31}
-#endif
 };
+#endif
 
 /**
  * Set the I2C bus speed for a given I2C device
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 fsl_i2c.c: Fix warning on gcc-6.x

Hello Tom,

Am 09.02.2017 um 21:40 schrieb Tom Rini:

Quoted 4 lines

With gcc-6.x we see:
drivers/i2c/fsl_i2c.c:86:3: warning: ?fsl_i2c_speed_map? defined but not used [-Wunused-const-variable=]

Quoted 8 lines

The easy way to fix this is that since we only use fsl_i2c_speed_map at all on __M68K__ move the existing guards around slightly.

---
  drivers/i2c/fsl_i2c.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

Thanks!

Do you want to pick up this patch directly, or should I send an i2c pull request?

bye,
Heiko

Quoted 32 lines
drivers/i2c/fsl_i2c.c +2 -2
index e9fbf828f34b..a1406baa87b2 100644
@@ -53,6 +53,7 @@ static const struct fsl_i2c_base *i2c_base[4] = {
 
  /* I2C speed map for a DFSR value of 1 */
 
+#ifdef __M68K__
  /*
   * Map I2C frequency dividers to FDR and DFSR values
   *
@@ -84,7 +85,6 @@ static const struct {
  	unsigned short divider;
  	u8 fdr;
  } fsl_i2c_speed_map[] = {
-#ifdef __M68K__
  	{20, 32}, {22, 33}, {24, 34}, {26, 35},
  	{28, 0}, {28, 36}, {30, 1}, {32, 37},
  	{34, 2}, {36, 38}, {40, 3}, {40, 39},
@@ -102,8 +102,8 @@ static const struct {
  	{1536, 61}, {1792, 62}, {1920, 27}, {2048, 63},
  	{2304, 28}, {2560, 29}, {3072, 30}, {3840, 31},
  	{-1, 31}
-#endif
  };
+#endif
 
  /**
   * Set the I2C bus speed for a given I2C device
Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
author
#2 lore raw

PATCH 1/1 fsl_i2c.c: Fix warning on gcc-6.x

Quoted 16 lines · Heiko Schocher

Hello Tom,

Am 09.02.2017 um 21:40 schrieb Tom Rini:

Quoted 4 lines

With gcc-6.x we see:
drivers/i2c/fsl_i2c.c:86:3: warning: ?fsl_i2c_speed_map? defined but not used [-Wunused-const-variable=]

Quoted 8 lines

The easy way to fix this is that since we only use fsl_i2c_speed_map at all on __M68K__ move the existing guards around slightly.

---
 drivers/i2c/fsl_i2c.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 6 lines

Thanks!

Do you want to pick up this patch directly, or should I send an i2c pull request?

If you have other i2c things to pick up, please pick it up, otherwise assign it to me (or York, we're going to sort out the rest of the big gcc-6.x warnings) and it'll get picked up.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170210/ece83ff9/attachment.sig>
author
#3 lore raw
In reply to Tom Rini
Quoted 10 lines · Tom Rini

With gcc-6.x we see:
drivers/i2c/fsl_i2c.c:86:3: warning: ?fsl_i2c_speed_map? defined but not used [-Wunused-const-variable=]

The easy way to fix this is that since we only use fsl_i2c_speed_map at all on __M68K__ move the existing guards around slightly.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170217/3e0055dc/attachment.sig>