From: Andrew Morton Cc: Michael Hanselmann Cc: Oliver Neukum Cc: Greg KH Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton --- drivers/usb/misc/appledisplay.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff -puN drivers/usb/misc/appledisplay.c~driver-for-apple-cinema-display-tweaks drivers/usb/misc/appledisplay.c --- devel/drivers/usb/misc/appledisplay.c~driver-for-apple-cinema-display-tweaks 2006-05-27 23:28:41.000000000 -0700 +++ devel-akpm/drivers/usb/misc/appledisplay.c 2006-05-27 23:28:41.000000000 -0700 @@ -71,9 +71,9 @@ MODULE_DEVICE_TABLE(usb, appledisplay_ta /* Structure to hold all of our device specific stuff */ struct appledisplay { - struct usb_device* udev; /* usb device */ - struct urb* urb; /* usb request block */ - struct backlight_device* bd; /* backlight device */ + struct usb_device *udev; /* usb device */ + struct urb *urb; /* usb request block */ + struct backlight_device *bd; /* backlight device */ char *urbdata; /* interrupt URB data buffer */ char *msgdata; /* control message data buffer */ @@ -85,7 +85,7 @@ struct appledisplay { static atomic_t count_displays = ATOMIC_INIT(0); static struct workqueue_struct *wq; -static void appledisplay_complete(struct urb* urb, struct pt_regs* regs) +static void appledisplay_complete(struct urb *urb, struct pt_regs *regs) { struct appledisplay *pdata = urb->context; unsigned long flags; @@ -96,7 +96,7 @@ static void appledisplay_complete(struct /* success */ break; case -EOVERFLOW: - printk("appletouch: OVERFLOW with data " + printk(KERN_ERR "appletouch: OVERFLOW with data " "length %d, actual length is %d\n", ACD_URB_BUFFER_LEN, pdata->urb->actual_length); case -ECONNRESET: @@ -248,7 +248,8 @@ static int appledisplay_probe(struct usb pdata->msgdata = kmalloc(ACD_MSG_BUFFER_LEN, GFP_KERNEL); if (!pdata->msgdata) { retval = -ENOMEM; - err("appledisplay: Allocating buffer for control messages failed"); + err("appledisplay: Allocating buffer for control messages " + "failed"); goto error; } @@ -272,7 +273,8 @@ static int appledisplay_probe(struct usb /* Configure interrupt URB */ usb_fill_int_urb(pdata->urb, udev, usb_rcvintpipe(udev, int_in_endpointAddr), - pdata->urbdata, ACD_URB_BUFFER_LEN, appledisplay_complete, pdata, 1); + pdata->urbdata, ACD_URB_BUFFER_LEN, appledisplay_complete, + pdata, 1); if (usb_submit_urb(pdata->urb, GFP_KERNEL)) { retval = -EIO; err("appledisplay: Submitting URB failed"); @@ -282,7 +284,8 @@ static int appledisplay_probe(struct usb /* Register backlight device */ snprintf(bl_name, sizeof(bl_name), "appledisplay%d", atomic_inc_return(&count_displays) - 1); - pdata->bd = backlight_device_register(bl_name, pdata, &appledisplay_bl_data); + pdata->bd = backlight_device_register(bl_name, pdata, + &appledisplay_bl_data); if (IS_ERR(pdata->bd)) { err("appledisplay: Backlight registration failed"); goto error; _