Skip to contentSkip to conversation

s5pc1xx: SMDKC100: fix compile warnings

PATCH New Minkyu Kang 3 participants 3 messages Oct 15, 2009 – Oct 18, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s5pc1xx: SMDKC100: fix compile warnings

fix the following compile warnings
warning: dereferencing type-punned pointer will break strict-aliasing rules

---
 drivers/serial/serial_s5pc1xx.c      |    2 +-
 include/asm-arm/arch-s5pc1xx/clock.h |   88 +++++++++++++++++-----------------
 include/asm-arm/arch-s5pc1xx/gpio.h  |   12 ++--
 include/asm-arm/arch-s5pc1xx/pwm.h   |   36 +++++++-------
 include/asm-arm/arch-s5pc1xx/uart.h  |   18 ++++----
 include/linux/mtd/samsung_onenand.h  |   70 +++++++++++++-------------
 6 files changed, 113 insertions(+), 113 deletions(-)
drivers/serial/serial_s5pc1xx.c +1 -1
index 64c1dcc..68c06a9 100644
@@ -74,7 +74,7 @@ void serial_setbrg_dev(const int dev_index)
 	val = pclk / baudrate;
 
 	writel(val / 16 - 1, &uart->ubrdiv);
-	writel(udivslot[val % 16], &uart->udivslot);
+	writew(udivslot[val % 16], &uart->udivslot);
 }
 
 /*
include/asm-arm/arch-s5pc1xx/clock.h +44 -44

113 lines not on this page · raw message

include/asm-arm/arch-s5pc1xx/gpio.h +6 -6
index 0010405..afbc7ea 100644
@@ -23,12 +23,12 @@
 
 #ifndef __ASSEMBLY__
 struct s5pc1xx_gpio_bank {
-	unsigned long	con;
-	unsigned long	dat;
-	unsigned long	pull;
-	unsigned long	drv;
-	unsigned long	pdn_con;
-	unsigned long	pdn_pull;
+	unsigned int	con;
+	unsigned int	dat;
+	unsigned int	pull;
+	unsigned int	drv;
+	unsigned int	pdn_con;
+	unsigned int	pdn_pull;
 	unsigned char	res1[8];
 };
 
include/asm-arm/arch-s5pc1xx/pwm.h +18 -18
index 53c23cd..e02a8d8 100644
@@ -35,24 +35,24 @@
 
 #ifndef __ASSEMBLY__
 struct s5pc1xx_timer {
-	unsigned long	tcfg0;
-	unsigned long	tcfg1;
-	unsigned long	tcon;
-	unsigned long	tcntb0;
-	unsigned long	tcmpb0;
-	unsigned long	tcnto0;
-	unsigned long	tcntb1;
-	unsigned long	tcmpb1;
-	unsigned long	tcnto1;
-	unsigned long	tcntb2;
-	unsigned long	tcmpb2;
-	unsigned long	tcnto2;
-	unsigned long	tcntb3;
-	unsigned long	res1;
-	unsigned long	tcnto3;
-	unsigned long	tcntb4;
-	unsigned long	tcnto4;
-	unsigned long	tintcstat;
+	unsigned int	tcfg0;
+	unsigned int	tcfg1;
+	unsigned int	tcon;
+	unsigned int	tcntb0;
+	unsigned int	tcmpb0;
+	unsigned int	tcnto0;
+	unsigned int	tcntb1;
+	unsigned int	tcmpb1;
+	unsigned int	tcnto1;
+	unsigned int	tcntb2;
+	unsigned int	tcmpb2;
+	unsigned int	tcnto2;
+	unsigned int	tcntb3;
+	unsigned int	res1;
+	unsigned int	tcnto3;
+	unsigned int	tcntb4;
+	unsigned int	tcnto4;
+	unsigned int	tintcstat;
 };
 #endif	/* __ASSEMBLY__ */
 
include/asm-arm/arch-s5pc1xx/uart.h +9 -9
index bd7d6b2..140dbdc 100644
@@ -25,19 +25,19 @@
 
 #ifndef __ASSEMBLY__
 struct s5pc1xx_uart {
-	unsigned long	ulcon;
-	unsigned long	ucon;
-	unsigned long	ufcon;
-	unsigned long	umcon;
-	unsigned long	utrstat;
-	unsigned long	uerstat;
-	unsigned long	ufstat;
-	unsigned long	umstat;
+	unsigned int	ulcon;
+	unsigned int	ucon;
+	unsigned int	ufcon;
+	unsigned int	umcon;
+	unsigned int	utrstat;
+	unsigned int	uerstat;
+	unsigned int	ufstat;
+	unsigned int	umstat;
 	unsigned char	utxh;
 	unsigned char	res1[3];
 	unsigned char	urxh;
 	unsigned char	res2[3];
-	unsigned long	ubrdiv;
+	unsigned int	ubrdiv;
 	unsigned short	udivslot;
 	unsigned char	res3[2];
 	unsigned char	res4[0x3d0];
include/linux/mtd/samsung_onenand.h +35 -35

110 lines not on this page · raw message

Signature · 1 line
1.5.4.3
#1 lore raw

PATCH 1/1 s5pc1xx: SMDKC100: fix compile warnings

Dear Tom

2009/10/15 Minkyu Kang <[email protected]>:

Quoted 4 lines

fix the following compile warnings
warning: dereferencing type-punned pointer will break strict-aliasing rules

Quoted 9 lines

---

?drivers/serial/serial_s5pc1xx.c ? ? ?| ? ?2 +-
?include/asm-arm/arch-s5pc1xx/clock.h | ? 88 +++++++++++++++++-----------------
?include/asm-arm/arch-s5pc1xx/gpio.h ?| ? 12 ++--
?include/asm-arm/arch-s5pc1xx/pwm.h ? | ? 36 +++++++-------
?include/asm-arm/arch-s5pc1xx/uart.h ?| ? 18 ++++----
?include/linux/mtd/samsung_onenand.h ?| ? 70 +++++++++++++-------------

?6 files changed, 113 insertions(+), 113 deletions(-)

If possible, could you please apply this patch to arm/master-sync directly?

Thanks
Minkyu Kang

Signature · 2 lines
from. prom.
www.promsoft.net
#2 lore raw

PATCH 1/1 s5pc1xx: SMDKC100: fix compile warnings

In reply to Minkyu Kang
Quoted 18 lines · Minkyu Kang

fix the following compile warnings
warning: dereferencing type-punned pointer will break strict-aliasing rules

---
 drivers/serial/serial_s5pc1xx.c      |    2 +-
 include/asm-arm/arch-s5pc1xx/clock.h |   88 +++++++++++++++++-----------------
 include/asm-arm/arch-s5pc1xx/gpio.h  |   12 ++--
 include/asm-arm/arch-s5pc1xx/pwm.h   |   36 +++++++-------
 include/asm-arm/arch-s5pc1xx/uart.h  |   18 ++++----
 include/linux/mtd/samsung_onenand.h  |   70 +++++++++++++-------------
 6 files changed, 113 insertions(+), 113 deletions(-)
drivers/serial/serial_s5pc1xx.c +0 -0
index 64c1dcc..68c06a9 100644

drivers/serial/serial_s5pc1xx.c void serial_setbrg_dev(const int dev_index) · line 78

Quoted 6 lines
drivers/serial/serial_s5pc1xx.c +1 -1
@@ -74,7 +74,7 @@ void serial_setbrg_dev(const int dev_index)
 	val = pclk / baudrate;
 
 	writel(val / 16 - 1, &uart->ubrdiv);
-	writel(udivslot[val % 16], &uart->udivslot);
+	writew(udivslot[val % 16], &uart->udivslot);
 }

If you are changing to using writew, the table udivslot should also change to match the type of udivslot, unsigned short.

Please submit a follow-on change for this.
Ack-ed.

Tom