Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: serial: keyspan_pda: clean up urb->status usage

This done in anticipation of removal of urb->status, which will make
that patch easier to review and apply in the future.


Cc: <linux-usb-devel@lists.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+10 -7
+10 -7
drivers/usb/serial/keyspan_pda.c
··· 218 218 struct tty_struct *tty = port->tty; 219 219 unsigned char *data = urb->transfer_buffer; 220 220 int i; 221 - int status; 221 + int retval; 222 + int status = urb->status; 222 223 struct keyspan_pda_private *priv; 223 224 priv = usb_get_serial_port_data(port); 224 225 225 - switch (urb->status) { 226 + switch (status) { 226 227 case 0: 227 228 /* success */ 228 229 break; ··· 231 230 case -ENOENT: 232 231 case -ESHUTDOWN: 233 232 /* this urb is terminated, clean up */ 234 - dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status); 233 + dbg("%s - urb shutting down with status: %d", 234 + __FUNCTION__, status); 235 235 return; 236 236 default: 237 - dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status); 237 + dbg("%s - nonzero urb status received: %d", 238 + __FUNCTION__, status); 238 239 goto exit; 239 240 } 240 241 ··· 271 268 } 272 269 273 270 exit: 274 - status = usb_submit_urb (urb, GFP_ATOMIC); 275 - if (status) 271 + retval = usb_submit_urb (urb, GFP_ATOMIC); 272 + if (retval) 276 273 err ("%s - usb_submit_urb failed with result %d", 277 - __FUNCTION__, status); 274 + __FUNCTION__, retval); 278 275 } 279 276 280 277