Skip to content

Commit

Permalink
Staging: ced1401: usb1401: fix build errors.
Browse files Browse the repository at this point in the history
This fixes up the usb1401.c file to remove the usage of err() (which is
gone), and the two-argument kmap_atomic() call, and the compat_ioctl
pointer warning.

The code now builds properly, there are lots of warnings still, but it's
a start.

Cc: Alois Schlögl <alois.schloegl@ist.ac.at>
Cc: Greg P. Smith <greg@ced.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed Sep 18, 2012
1 parent 2eae6bd commit 6ede1ed
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions drivers/staging/ced1401/usb1401.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ static int ced_open(struct inode *inode, struct file *file)
struct usb_interface* interface = usb_find_interface(&ced_driver, subminor);
if (!interface)
{
err("%s - error, can't find device for minor %d", __func__, subminor);
pr_err("%s - error, can't find device for minor %d", __func__, subminor);
retval = -ENODEV;
goto exit;
}
Expand Down Expand Up @@ -491,7 +491,7 @@ static void CopyUserSpace(DEVICE_EXTENSION *pdx, int n)
int nPage = dwOffset >> PAGE_SHIFT; // page number in table
if (nPage < pArea->nPages)
{
char *pvAddress = (char*)kmap_atomic(pArea->pPages[nPage], KM_IRQ0);
char *pvAddress = (char*)kmap_atomic(pArea->pPages[nPage]);
if (pvAddress)
{
unsigned int uiPageOff = dwOffset & (PAGE_SIZE-1); // offset into the page
Expand All @@ -502,7 +502,7 @@ static void CopyUserSpace(DEVICE_EXTENSION *pdx, int n)
memcpy(pvAddress+uiPageOff, pCoherBuf, uiXfer);
else
memcpy(pCoherBuf, pvAddress+uiPageOff, uiXfer);
kunmap_atomic(pvAddress, KM_IRQ0);
kunmap_atomic(pvAddress);
dwOffset += uiXfer;
pCoherBuf += uiXfer;
n -= uiXfer;
Expand Down Expand Up @@ -1198,7 +1198,7 @@ int Allowi(DEVICE_EXTENSION* pdx, bool bInCallback)
** enough for a 64-bit pointer.
*****************************************************************************/
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
static int ced_ioctl(struct file * file, unsigned int cmd, unsigned long ulArg)
static long ced_ioctl(struct file * file, unsigned int cmd, unsigned long ulArg)
#else
static int ced_ioctl(struct inode * node, struct file * file, unsigned int cmd, unsigned long ulArg)
#endif
Expand Down Expand Up @@ -1367,7 +1367,7 @@ static int ced_probe(struct usb_interface *interface, const struct usb_device_id
pdx = kzalloc(sizeof(*pdx), GFP_KERNEL);
if (!pdx)
{
err("Out of memory");
dev_err(&interface->dev, "Out of memory\n");
goto error;
}

Expand Down Expand Up @@ -1458,7 +1458,7 @@ static int ced_probe(struct usb_interface *interface, const struct usb_device_id
if (retval)
{
/* something prevented us from registering this driver */
err("Not able to get a minor for this device.");
dev_err(&interface->dev, "Not able to get a minor for this device.\n");
usb_set_intfdata(interface, NULL);
goto error;
}
Expand Down Expand Up @@ -1578,11 +1578,7 @@ static struct usb_driver ced_driver =
static int __init usb_skel_init(void)
{
/* register this driver with the USB subsystem */
int result = usb_register(&ced_driver);
if (result)
err("usb_register failed. Error number %d", result);

return result;
return usb_register(&ced_driver);
}

static void __exit usb_skel_exit(void)
Expand Down

0 comments on commit 6ede1ed

Please sign in to comment.