From: Lidza Louina <lidza.louina@gmail.com>
Date: Wed, 28 Aug 2013 02:13:26 +0000 (-0400)
Subject: staging: dgnc: tty.c: updates uart_struct declaration for sparse
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a7a75386f958daa23ac042c0a12b48944ff41c53;p=linux-beck.git

staging: dgnc: tty.c: updates uart_struct declaration for sparse

This patch edits the type casts neo_uart_struct and
cls_uart_struct. A previous patch added the marker __iomem
to these structs. This patch ensures that the change to
the marker is consistent. This also removes these
sparse warnings:

warning: incorrect type in assignment (different address spaces)
  expected struct neo_uart_struct [noderef] <asn:2>*ch_neo_uart
  got struct neo_uart_struct *<noident>
warning: incorrect type in assignment (different address spaces)
  expected struct cls_uart_struct [noderef] <asn:2>*ch_cls_uart
  got struct cls_uart_struct *<noident>

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c
index a54b82966976..b4fa29f83cd8 100644
--- a/drivers/staging/dgnc/dgnc_tty.c
+++ b/drivers/staging/dgnc/dgnc_tty.c
@@ -344,7 +344,7 @@ int dgnc_tty_register(struct board_t *brd)
 int dgnc_tty_init(struct board_t *brd)
 {
 	int i;
-	u8 __iomem *vaddr;
+	void __iomem *vaddr;
 	struct channel_t *ch;
 
 	if (!brd)
@@ -403,9 +403,9 @@ int dgnc_tty_init(struct board_t *brd)
 		ch->ch_pun.un_dev = i + 128;
 
 		if (brd->bd_uart_offset == 0x200)
-			ch->ch_neo_uart = (struct neo_uart_struct *) ((ulong) vaddr + (brd->bd_uart_offset * i));
+			ch->ch_neo_uart = vaddr + (brd->bd_uart_offset * i);
 		else
-			ch->ch_cls_uart = (struct cls_uart_struct *) ((ulong) vaddr + (brd->bd_uart_offset * i));
+			ch->ch_cls_uart = vaddr + (brd->bd_uart_offset * i);
 
 		ch->ch_bd = brd;
 		ch->ch_portnum = i;