summaryrefslogtreecommitdiff
path: root/drivers/staging/ced1401
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-05-22 15:36:32 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-22 15:31:39 -0700
commit6e3fe5dcd7f136e5802b1a54c0dfbc9aeb302adb (patch)
treebe9a7108b72a24262ba6f7f93a4c6f319e179e3c /drivers/staging/ced1401
parentbcf636d126277e60258183d42edfbffeed605f6e (diff)
Staging: ced1401: Use NULL instead of 0 for pointers
Use NULL instead of 0 for pointer variables. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ced1401')
-rw-r--r--drivers/staging/ced1401/ced_ioc.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/staging/ced1401/ced_ioc.c b/drivers/staging/ced1401/ced_ioc.c
index 678424035ecc..a31adb3da3a4 100644
--- a/drivers/staging/ced1401/ced_ioc.c
+++ b/drivers/staging/ced1401/ced_ioc.c
@@ -599,7 +599,7 @@ int ClearArea(DEVICE_EXTENSION *pdx, int nArea)
else {
/* We must save the memory we return as we shouldn't mess with memory while */
/* holding a spin lock. */
- struct page **pPages = 0; /* save page address list */
+ struct page **pPages = NULL; /*save page address list*/
int nPages = 0; /* and number of pages */
int np;
@@ -671,7 +671,7 @@ static int SetArea(DEVICE_EXTENSION *pdx, int nArea, char __user *puBuf,
int len = (dwLength + ulOffset + PAGE_SIZE - 1) >> PAGE_SHIFT;
TRANSAREA *pTA = &pdx->rTransDef[nArea]; /* to save typing */
- struct page **pPages = 0; /* space for page tables */
+ struct page **pPages = NULL; /* space for page tables */
int nPages = 0; /* and number of pages */
int iReturn = ClearArea(pdx, nArea); /* see if OK to use this area */
@@ -693,8 +693,8 @@ static int SetArea(DEVICE_EXTENSION *pdx, int nArea, char __user *puBuf,
/* To pin down user pages we must first acquire the mapping semaphore. */
down_read(&current->mm->mmap_sem); /* get memory map semaphore */
- nPages =
- get_user_pages(current, current->mm, ulStart, len, 1, 0, pPages, 0);
+ nPages = get_user_pages(current, current->mm, ulStart, len, 1, 0,
+ pPages, NULL);
up_read(&current->mm->mmap_sem); /* release the semaphore */
dev_dbg(&pdx->interface->dev, "%s nPages = %d", __func__, nPages);
@@ -984,7 +984,9 @@ int StartSelfTest(DEVICE_EXTENSION *pdx)
/* ReadWrite_Cancel(pDeviceObject); */
pdx->dwDMAFlag = MODE_CHAR; /* Clear DMA mode flags here */
- nGot = usb_control_msg(pdx->udev, usb_rcvctrlpipe(pdx->udev, 0), DB_SELFTEST, (H_TO_D | VENDOR | DEVREQ), 0, 0, 0, 0, HZ); /* allow 1 second timeout */
+ nGot = usb_control_msg(pdx->udev, usb_rcvctrlpipe(pdx->udev, 0),
+ DB_SELFTEST, (H_TO_D | VENDOR | DEVREQ),
+ 0, 0, NULL, 0, HZ); /* allow 1 second timeout */
pdx->ulSelfTestTime = jiffies + HZ * 30; /* 30 seconds into the future */
mutex_unlock(&pdx->io_mutex);
@@ -1128,7 +1130,11 @@ static int DbgCmd1401(DEVICE_EXTENSION *pdx, unsigned char cmd,
{
int iReturn;
dev_dbg(&pdx->interface->dev, "%s entry", __func__);
- iReturn = usb_control_msg(pdx->udev, usb_sndctrlpipe(pdx->udev, 0), cmd, (H_TO_D | VENDOR | DEVREQ), (unsigned short)data, (unsigned short)(data >> 16), 0, 0, HZ); /* allow 1 second timeout */
+ iReturn = usb_control_msg(pdx->udev, usb_sndctrlpipe(pdx->udev, 0), cmd,
+ (H_TO_D | VENDOR | DEVREQ),
+ (unsigned short)data,
+ (unsigned short)(data >> 16), NULL, 0, HZ);
+ /* allow 1 second timeout */
if (iReturn < 0)
dev_err(&pdx->interface->dev, "%s fail code=%d", __func__,
iReturn);