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

USB: serial: ti_usb_3410_5052: 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>
Cc: Al Borchers <alborchers@steinerpoint.com>
Cc: Peter Berger <pberger@brimson.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Greg Kroah-Hartman 52171b48 17dd2215

+27 -19
+27 -19
drivers/usb/serial/ti_usb_3410_5052.c
··· 1112 1112 int length = urb->actual_length; 1113 1113 int port_number; 1114 1114 int function; 1115 - int status; 1115 + int status = urb->status; 1116 + int retval; 1116 1117 __u8 msr; 1117 1118 1118 1119 dbg("%s", __FUNCTION__); 1119 1120 1120 - switch (urb->status) { 1121 + switch (status) { 1121 1122 case 0: 1122 1123 break; 1123 1124 case -ECONNRESET: 1124 1125 case -ENOENT: 1125 1126 case -ESHUTDOWN: 1126 - dbg("%s - urb shutting down, %d", __FUNCTION__, urb->status); 1127 + dbg("%s - urb shutting down, %d", __FUNCTION__, status); 1127 1128 tdev->td_urb_error = 1; 1128 1129 return; 1129 1130 default: 1130 - dev_err(dev, "%s - nonzero urb status, %d\n", __FUNCTION__, urb->status); 1131 + dev_err(dev, "%s - nonzero urb status, %d\n", 1132 + __FUNCTION__, status); 1131 1133 tdev->td_urb_error = 1; 1132 1134 goto exit; 1133 1135 } ··· 1177 1175 } 1178 1176 1179 1177 exit: 1180 - status = usb_submit_urb(urb, GFP_ATOMIC); 1181 - if (status) 1182 - dev_err(dev, "%s - resubmit interrupt urb failed, %d\n", __FUNCTION__, status); 1178 + retval = usb_submit_urb(urb, GFP_ATOMIC); 1179 + if (retval) 1180 + dev_err(dev, "%s - resubmit interrupt urb failed, %d\n", 1181 + __FUNCTION__, retval); 1183 1182 } 1184 1183 1185 1184 ··· 1189 1186 struct ti_port *tport = (struct ti_port *)urb->context; 1190 1187 struct usb_serial_port *port = tport->tp_port; 1191 1188 struct device *dev = &urb->dev->dev; 1192 - int status = 0; 1189 + int status = urb->status; 1190 + int retval = 0; 1193 1191 1194 1192 dbg("%s", __FUNCTION__); 1195 1193 1196 - switch (urb->status) { 1194 + switch (status) { 1197 1195 case 0: 1198 1196 break; 1199 1197 case -ECONNRESET: 1200 1198 case -ENOENT: 1201 1199 case -ESHUTDOWN: 1202 - dbg("%s - urb shutting down, %d", __FUNCTION__, urb->status); 1200 + dbg("%s - urb shutting down, %d", __FUNCTION__, status); 1203 1201 tport->tp_tdev->td_urb_error = 1; 1204 1202 wake_up_interruptible(&tport->tp_write_wait); 1205 1203 return; 1206 1204 default: 1207 - dev_err(dev, "%s - nonzero urb status, %d\n", __FUNCTION__, urb->status ); 1205 + dev_err(dev, "%s - nonzero urb status, %d\n", 1206 + __FUNCTION__, status ); 1208 1207 tport->tp_tdev->td_urb_error = 1; 1209 1208 wake_up_interruptible(&tport->tp_write_wait); 1210 1209 } 1211 1210 1212 - if (urb->status == -EPIPE) 1211 + if (status == -EPIPE) 1213 1212 goto exit; 1214 1213 1215 - if (urb->status) { 1214 + if (status) { 1216 1215 dev_err(dev, "%s - stopping read!\n", __FUNCTION__); 1217 1216 return; 1218 1217 } ··· 1239 1234 spin_lock(&tport->tp_lock); 1240 1235 if (tport->tp_read_urb_state == TI_READ_URB_RUNNING) { 1241 1236 urb->dev = port->serial->dev; 1242 - status = usb_submit_urb(urb, GFP_ATOMIC); 1237 + retval = usb_submit_urb(urb, GFP_ATOMIC); 1243 1238 } else if (tport->tp_read_urb_state == TI_READ_URB_STOPPING) { 1244 1239 tport->tp_read_urb_state = TI_READ_URB_STOPPED; 1245 1240 } 1246 1241 spin_unlock(&tport->tp_lock); 1247 - if (status) 1248 - dev_err(dev, "%s - resubmit read urb failed, %d\n", __FUNCTION__, status); 1242 + if (retval) 1243 + dev_err(dev, "%s - resubmit read urb failed, %d\n", 1244 + __FUNCTION__, retval); 1249 1245 } 1250 1246 1251 1247 ··· 1255 1249 struct ti_port *tport = (struct ti_port *)urb->context; 1256 1250 struct usb_serial_port *port = tport->tp_port; 1257 1251 struct device *dev = &urb->dev->dev; 1252 + int status = urb->status; 1258 1253 1259 1254 dbg("%s - port %d", __FUNCTION__, port->number); 1260 1255 1261 1256 tport->tp_write_urb_in_use = 0; 1262 1257 1263 - switch (urb->status) { 1258 + switch (status) { 1264 1259 case 0: 1265 1260 break; 1266 1261 case -ECONNRESET: 1267 1262 case -ENOENT: 1268 1263 case -ESHUTDOWN: 1269 - dbg("%s - urb shutting down, %d", __FUNCTION__, urb->status); 1264 + dbg("%s - urb shutting down, %d", __FUNCTION__, status); 1270 1265 tport->tp_tdev->td_urb_error = 1; 1271 1266 wake_up_interruptible(&tport->tp_write_wait); 1272 1267 return; 1273 1268 default: 1274 - dev_err(dev, "%s - nonzero urb status, %d\n", __FUNCTION__, urb->status); 1269 + dev_err(dev, "%s - nonzero urb status, %d\n", 1270 + __FUNCTION__, status); 1275 1271 tport->tp_tdev->td_urb_error = 1; 1276 1272 wake_up_interruptible(&tport->tp_write_wait); 1277 1273 }