[PATCH] ced1401 coding style fixes

[Jinqiang Zeng]

Signed-off-by: Jinqiang Zeng 
---
 drivers/staging/ced1401/usb1401.c   |8 ++--
 drivers/staging/ced1401/use14_ioc.h |4 
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/ced1401/usb1401.c 
b/drivers/staging/ced1401/usb1401.c
index 284abc0..5028318 100644
--- a/drivers/staging/ced1401/usb1401.c
+++ b/drivers/staging/ced1401/usb1401.c
@@ -896,7 +896,7 @@ static bool ReadWord(unsigned short *pWord, char *pBuf, 
unsigned int *pdDone,
 ** to indicate three byte total.
 **
 */
-static bool ReadHuff(volatile unsigned int *pDWord, char *pBuf,
+static bool ReadHuff(unsigned int *pDWord, char *pBuf,
 unsigned int *pdDone, unsigned int dGot)
 {
unsigned char ucData;   /* for each read to ReadChar */
@@ -941,7 +941,7 @@ static bool ReadHuff(volatile unsigned int *pDWord, char 
*pBuf,
 **  we start handling the data at offset zero.
 **
 */
-static bool ReadDMAInfo(volatile DMADESC *pDmaDesc, DEVICE_EXTENSION *pdx,
+static bool ReadDMAInfo(DMADESC *pDmaDesc, DEVICE_EXTENSION *pdx,
char *pBuf, unsigned int dwCount)
 {
bool bResult = false;   /*  assume we won't succeed */
@@ -1122,6 +1122,7 @@ static void ced_readchar_callback(struct urb *pUrb)
spin_lock(&pdx->charInLock);/*  already at irq 
level */
if (nGot > 0) {
unsigned int i;
+
if (nGot < INBUF_SZ) {
pdx->pCoherCharIn[nGot] = 0;/*  
tidy the string */
dev_dbg(&pdx->interface->dev,
@@ -1514,6 +1515,7 @@ static void ced_disconnect(struct usb_interface 
*interface)
 void ced_draw_down(DEVICE_EXTENSION *pdx)
 {
int time;
+
dev_dbg(&pdx->interface->dev, "%s: called\n", __func__);
 
pdx->bInDrawDown = true;
@@ -1548,6 +1550,7 @@ static int ced_resume(struct usb_interface *intf)
 static int ced_pre_reset(struct usb_interface *intf)
 {
DEVICE_EXTENSION *pdx = usb_get_intfdata(intf);
+
dev_dbg(&pdx->interface->dev, "%s\n", __func__);
mutex_lock(&pdx->io_mutex);
ced_draw_down(pdx);
@@ -1557,6 +1560,7 @@ static int ced_pre_reset(struct usb_interface *intf)
 static int ced_post_reset(struct usb_interface *intf)
 {
DEVICE_EXTENSION *pdx = usb_get_intfdata(intf);
+
dev_dbg(&pdx->interface->dev, "%s\n", __func__);
 
/* we are sure no URBs are active - no locking needed */
diff --git a/drivers/staging/ced1401/use14_ioc.h 
b/drivers/staging/ced1401/use14_ioc.h
index 42d2e4e..c27b3b9 100644
--- a/drivers/staging/ced1401/use14_ioc.h
+++ b/drivers/staging/ced1401/use14_ioc.h
@@ -267,15 +267,11 @@ typedef union /* to communicate with 1401 driver 
status & control funcs */
T1401REGISTERS registers;
 } TCSBLOCK;
 
-typedef TCSBLOCK*  LPTCSBLOCK;
-
 typedef struct paramBlk {
 short   sState;
 TCSBLOCKcsBlock;
 } PARAMBLK;
 
-typedef PARAMBLK*   PPARAMBLK;
-
 struct transfer_area_desc  /* Structure and type for SetTransArea */
 {
unsigned shortwArea;/* number of transfer area to 
set up   */
-- 
1.7.7.6

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH] dgap: fix sparse warnings

[Jinqiang Zeng]

fix the sparse warnings
drivers/staging/dgap/dgap.c:689:28: warning: incorrect type in argument 1 
(different address spaces)
drivers/staging/dgap/dgap.c:689:28:expected void volatile [noderef] 
*addr
drivers/staging/dgap/dgap.c:689:28:got unsigned char [usertype] *re_map_port
drivers/staging/dgap/dgap.c:695:28: warning: incorrect type in argument 1 
(different address spaces)
drivers/staging/dgap/dgap.c:695:28:expected void volatile [noderef] 
*addr
drivers/staging/dgap/dgap.c:695:28:got unsigned char [usertype] 
*re_map_membase


Signed-off-by: Jinqiang Zeng 
---
 drivers/staging/dgap/dgap.h |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/dgap/dgap.h b/drivers/staging/dgap/dgap.h
index 6b8f5f8..bceff7d 100644
--- a/drivers/staging/dgap/dgap.h
+++ b/drivers/staging/dgap/dgap.h
@@ -578,8 +578,8 @@ struct board_t {
ulong   membase;/* Start of base memory of the card */
ulong   membase_end;/* End of base memory of the card */
 
-   uchar   *re_map_port;   /* Remapped io port of the card */
-   uchar   *re_map_membase;/* Remapped memory of the card */
+   uchar __iomem   *re_map_port;   /* Remapped io port of the card */
+   uchar __iomem   *re_map_membase;/* Remapped memory of the card */
 
uchar   runwait;/* # Processes waiting for FEP  */
uchar   inhibit_poller; /* Tells  the poller to leave us alone 
*/
-- 
1.7.7.6

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel