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

[PATCH] UEAGLE : cosmetic

this patch is purely cosmetic. There is :
- indentation cleaning
- unneeded cast removing
- comments cleaning

Signed-off-by: Matthieu CASTET <castet.matthieu@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

matthieu castet and committed by
Greg Kroah-Hartman
e40abaf6 3c9666cc

+11 -21
+11 -21
drivers/usb/atm/ueagle-atm.c
··· 632 632 dsp_name = FW_DIR "DSPep.bin"; 633 633 } 634 634 635 - ret = request_firmware(&sc->dsp_firm, 636 - dsp_name, &sc->usb_dev->dev); 635 + ret = request_firmware(&sc->dsp_firm, dsp_name, &sc->usb_dev->dev); 637 636 if (ret < 0) { 638 637 uea_err(INS_TO_USBDEV(sc), 639 638 "requesting firmware %s failed with error %d\n", ··· 747 748 return ret; 748 749 749 750 return (ret == 0) ? -ETIMEDOUT : 0; 750 - 751 751 } 752 752 753 753 #define UCDC_SEND_ENCAPSULATED_COMMAND 0x00 ··· 1187 1189 } 1188 1190 } 1189 1191 1190 - /* finish to send the fpga 1191 - */ 1192 + /* finish to send the fpga */ 1192 1193 ret = uea_request(sc, 0xe, 1, 0, NULL); 1193 1194 if (ret < 0) { 1194 1195 uea_err(INS_TO_USBDEV(sc), ··· 1195 1198 goto err1; 1196 1199 } 1197 1200 1198 - /* 1199 - * Tell the modem we finish : de-assert reset 1200 - */ 1201 + /* Tell the modem we finish : de-assert reset */ 1201 1202 value = 0; 1202 1203 ret = uea_send_modem_cmd(sc->usb_dev, 0xe, 1, &value); 1203 1204 if (ret < 0) ··· 1209 1214 return ret; 1210 1215 } 1211 1216 1217 + /* The modem send us an ack. First with check if it right */ 1212 1218 static void uea_dispatch_cmv(struct uea_softc *sc, struct cmv* cmv) 1213 1219 { 1214 1220 uea_enters(INS_TO_USBDEV(sc)); ··· 1269 1273 */ 1270 1274 static void uea_intr(struct urb *urb, struct pt_regs *regs) 1271 1275 { 1272 - struct uea_softc *sc = (struct uea_softc *)urb->context; 1273 - struct intr_pkt *intr; 1276 + struct uea_softc *sc = urb->context; 1277 + struct intr_pkt *intr = urb->transfer_buffer; 1274 1278 uea_enters(INS_TO_USBDEV(sc)); 1275 1279 1276 - if (urb->status < 0) { 1280 + if (unlikely(urb->status < 0)) { 1277 1281 uea_err(INS_TO_USBDEV(sc), "uea_intr() failed with %d\n", 1278 1282 urb->status); 1279 1283 return; 1280 1284 } 1281 1285 1282 - intr = (struct intr_pkt *) urb->transfer_buffer; 1283 - 1284 1286 /* device-to-host interrupt */ 1285 1287 if (intr->bType != 0x08 || sc->booting) { 1286 - uea_err(INS_TO_USBDEV(sc), "wrong intr\n"); 1287 - // rebooting ? 1288 - // sc->reset = 1; 1288 + uea_err(INS_TO_USBDEV(sc), "wrong interrupt\n"); 1289 1289 goto resubmit; 1290 1290 } 1291 1291 ··· 1297 1305 break; 1298 1306 1299 1307 default: 1300 - uea_err(INS_TO_USBDEV(sc), "unknown intr %u\n", 1308 + uea_err(INS_TO_USBDEV(sc), "unknown interrupt %u\n", 1301 1309 le16_to_cpu(intr->wInterrupt)); 1302 1310 } 1303 1311 ··· 1376 1384 int ret; 1377 1385 uea_enters(INS_TO_USBDEV(sc)); 1378 1386 ret = kthread_stop(sc->kthread); 1379 - uea_info(INS_TO_USBDEV(sc), "kthread finish with status %d\n", ret); 1387 + uea_dbg(INS_TO_USBDEV(sc), "kthread finish with status %d\n", ret); 1380 1388 1381 1389 /* stop any pending boot process */ 1382 1390 flush_scheduled_work(); ··· 1633 1641 if (ret < 0) 1634 1642 return ret; 1635 1643 1636 - /* ADI930 has only 2 interfaces and inbound traffic 1637 - * is on interface 1 1638 - */ 1644 + /* ADI930 has only 2 interfaces and inbound traffic is on interface 1 */ 1639 1645 if (UEA_CHIP_VERSION(id) != ADI930) { 1640 1646 /* interface 2 is for inbound traffic */ 1641 1647 ret = claim_interface(usb, usbatm, UEA_DS_IFACE_NO);