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

USB: serial: remove redundant OOM messages

Remove redundant error messages on allocation failures, which have
already been logged.

Cc: Joe Perches <joe@perches.com>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Johan Hovold and committed by
Greg Kroah-Hartman
10c642d0 4d5147ec

+74 -217
+1 -3
drivers/usb/serial/ch341.c
··· 384 384 uint8_t *break_reg; 385 385 386 386 break_reg = kmalloc(2, GFP_KERNEL); 387 - if (!break_reg) { 388 - dev_err(&port->dev, "%s - kmalloc failed\n", __func__); 387 + if (!break_reg) 389 388 return; 390 - } 391 389 392 390 r = ch341_control_in(port->serial->dev, CH341_REQ_READ_REG, 393 391 ch341_break_reg, 0, break_reg, 2);
-2
drivers/usb/serial/console.c
··· 135 135 tty = kzalloc(sizeof(*tty), GFP_KERNEL); 136 136 if (!tty) { 137 137 retval = -ENOMEM; 138 - dev_err(&port->dev, "no more memory\n"); 139 138 goto reset_open_count; 140 139 } 141 140 kref_init(&tty->kref); ··· 143 144 tty->index = co->index; 144 145 if (tty_init_termios(tty)) { 145 146 retval = -ENOMEM; 146 - dev_err(&port->dev, "no more memory\n"); 147 147 goto free_tty; 148 148 } 149 149 }
+2 -6
drivers/usb/serial/cp210x.c
··· 305 305 length = (((size - 1) | 3) + 1) / 4; 306 306 307 307 buf = kcalloc(length, sizeof(__le32), GFP_KERNEL); 308 - if (!buf) { 309 - dev_err(&port->dev, "%s - out of memory.\n", __func__); 308 + if (!buf) 310 309 return -ENOMEM; 311 - } 312 310 313 311 /* Issue the request, attempting to read 'size' bytes */ 314 312 result = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), ··· 350 352 length = (((size - 1) | 3) + 1) / 4; 351 353 352 354 buf = kmalloc(length * sizeof(__le32), GFP_KERNEL); 353 - if (!buf) { 354 - dev_err(&port->dev, "%s - out of memory.\n", __func__); 355 + if (!buf) 355 356 return -ENOMEM; 356 - } 357 357 358 358 /* Array of integers into bytes */ 359 359 for (i = 0; i < length; i++)
+1 -4
drivers/usb/serial/ftdi_sio.c
··· 1695 1695 1696 1696 1697 1697 priv = kzalloc(sizeof(struct ftdi_private), GFP_KERNEL); 1698 - if (!priv) { 1699 - dev_err(&port->dev, "%s- kmalloc(%Zd) failed.\n", __func__, 1700 - sizeof(struct ftdi_private)); 1698 + if (!priv) 1701 1699 return -ENOMEM; 1702 - } 1703 1700 1704 1701 mutex_init(&priv->cfg_lock); 1705 1702
+5 -10
drivers/usb/serial/garmin_gps.c
··· 279 279 if (data_length) { 280 280 pkt = kmalloc(sizeof(struct garmin_packet)+data_length, 281 281 GFP_ATOMIC); 282 - if (pkt == NULL) { 283 - dev_err(&garmin_data_p->port->dev, "out of memory\n"); 282 + if (!pkt) 284 283 return 0; 285 - } 284 + 286 285 pkt->size = data_length; 287 286 memcpy(pkt->data, data, data_length); 288 287 ··· 1005 1006 spin_unlock_irqrestore(&garmin_data_p->lock, flags); 1006 1007 1007 1008 buffer = kmalloc(count, GFP_ATOMIC); 1008 - if (!buffer) { 1009 - dev_err(&port->dev, "out of memory\n"); 1009 + if (!buffer) 1010 1010 return -ENOMEM; 1011 - } 1012 1011 1013 1012 urb = usb_alloc_urb(0, GFP_ATOMIC); 1014 1013 if (!urb) { 1015 - dev_err(&port->dev, "no more free urbs\n"); 1016 1014 kfree(buffer); 1017 1015 return -ENOMEM; 1018 1016 } ··· 1389 1393 struct garmin_data *garmin_data_p; 1390 1394 1391 1395 garmin_data_p = kzalloc(sizeof(struct garmin_data), GFP_KERNEL); 1392 - if (garmin_data_p == NULL) { 1393 - dev_err(&port->dev, "%s - Out of memory\n", __func__); 1396 + if (!garmin_data_p) 1394 1397 return -ENOMEM; 1395 - } 1398 + 1396 1399 init_timer(&garmin_data_p->timer); 1397 1400 spin_lock_init(&garmin_data_p->lock); 1398 1401 INIT_LIST_HEAD(&garmin_data_p->pktlist);
+13 -35
drivers/usb/serial/io_edgeport.c
··· 898 898 edge_port->txfifo.fifo = kmalloc(edge_port->maxTxCredits, GFP_KERNEL); 899 899 900 900 if (!edge_port->txfifo.fifo) { 901 - dev_dbg(dev, "%s - no memory\n", __func__); 902 901 edge_close(port); 903 902 return -ENOMEM; 904 903 } ··· 907 908 edge_port->write_in_progress = false; 908 909 909 910 if (!edge_port->write_urb) { 910 - dev_dbg(dev, "%s - no memory\n", __func__); 911 911 edge_close(port); 912 912 return -ENOMEM; 913 913 } ··· 1243 1245 to send out */ 1244 1246 count = fifo->count; 1245 1247 buffer = kmalloc(count+2, GFP_ATOMIC); 1246 - if (buffer == NULL) { 1247 - dev_err_console(edge_port->port, 1248 - "%s - no more kernel memory...\n", __func__); 1248 + if (!buffer) { 1249 1249 edge_port->write_in_progress = false; 1250 1250 goto exit_send; 1251 1251 } ··· 2021 2025 dev_dbg(&serial->dev->dev, "%s - %x, %x, %d\n", __func__, extAddr, addr, length); 2022 2026 2023 2027 transfer_buffer = kmalloc(64, GFP_KERNEL); 2024 - if (!transfer_buffer) { 2025 - dev_err(&serial->dev->dev, "%s - kmalloc(%d) failed.\n", 2026 - __func__, 64); 2028 + if (!transfer_buffer) 2027 2029 return -ENOMEM; 2028 - } 2029 2030 2030 2031 /* need to split these writes up into 64 byte chunks */ 2031 2032 result = 0; ··· 2066 2073 unsigned char *transfer_buffer; 2067 2074 2068 2075 transfer_buffer = kmalloc(64, GFP_KERNEL); 2069 - if (!transfer_buffer) { 2070 - dev_err(&serial->dev->dev, "%s - kmalloc(%d) failed.\n", 2071 - __func__, 64); 2076 + if (!transfer_buffer) 2072 2077 return -ENOMEM; 2073 - } 2074 2078 2075 2079 /* need to split these writes up into 64 byte chunks */ 2076 2080 result = 0; ··· 2109 2119 unsigned char *transfer_buffer; 2110 2120 2111 2121 transfer_buffer = kmalloc(64, GFP_KERNEL); 2112 - if (!transfer_buffer) { 2113 - dev_err(&serial->dev->dev, 2114 - "%s - kmalloc(%d) failed.\n", __func__, 64); 2122 + if (!transfer_buffer) 2115 2123 return -ENOMEM; 2116 - } 2117 2124 2118 2125 /* need to split these reads up into 64 byte chunks */ 2119 2126 result = 0; ··· 2150 2163 int status = 0; 2151 2164 2152 2165 buffer = kmalloc(10, GFP_ATOMIC); 2153 - if (!buffer) { 2154 - dev_err(&edge_port->port->dev, 2155 - "%s - kmalloc(%d) failed.\n", __func__, 10); 2166 + if (!buffer) 2156 2167 return -ENOMEM; 2157 - } 2158 2168 2159 2169 currentCommand = buffer; 2160 2170 ··· 2258 2274 2259 2275 /* Alloc memory for the string of commands. */ 2260 2276 cmdBuffer = kmalloc(0x100, GFP_ATOMIC); 2261 - if (!cmdBuffer) { 2262 - dev_err(dev, "%s - kmalloc(%d) failed.\n", __func__, 0x100); 2277 + if (!cmdBuffer) 2263 2278 return -ENOMEM; 2264 - } 2279 + 2265 2280 currCmd = cmdBuffer; 2266 2281 2267 2282 /* Enable access to divisor latch */ ··· 2766 2783 2767 2784 /* create our private serial structure */ 2768 2785 edge_serial = kzalloc(sizeof(struct edgeport_serial), GFP_KERNEL); 2769 - if (edge_serial == NULL) { 2770 - dev_err(&serial->dev->dev, "%s - Out of memory\n", __func__); 2786 + if (!edge_serial) 2771 2787 return -ENOMEM; 2772 - } 2788 + 2773 2789 spin_lock_init(&edge_serial->es_lock); 2774 2790 edge_serial->serial = serial; 2775 2791 usb_set_serial_data(serial, edge_serial); ··· 2857 2875 /* not set up yet, so do it now */ 2858 2876 edge_serial->interrupt_read_urb = 2859 2877 usb_alloc_urb(0, GFP_KERNEL); 2860 - if (!edge_serial->interrupt_read_urb) { 2861 - dev_err(ddev, "out of memory\n"); 2878 + if (!edge_serial->interrupt_read_urb) 2862 2879 return -ENOMEM; 2863 - } 2880 + 2864 2881 edge_serial->interrupt_in_buffer = 2865 2882 kmalloc(buffer_size, GFP_KERNEL); 2866 2883 if (!edge_serial->interrupt_in_buffer) { 2867 - dev_err(ddev, "out of memory\n"); 2868 2884 usb_free_urb(edge_serial->interrupt_read_urb); 2869 2885 return -ENOMEM; 2870 2886 } ··· 2892 2912 /* not set up yet, so do it now */ 2893 2913 edge_serial->read_urb = 2894 2914 usb_alloc_urb(0, GFP_KERNEL); 2895 - if (!edge_serial->read_urb) { 2896 - dev_err(ddev, "out of memory\n"); 2915 + if (!edge_serial->read_urb) 2897 2916 return -ENOMEM; 2898 - } 2917 + 2899 2918 edge_serial->bulk_in_buffer = 2900 2919 kmalloc(buffer_size, GFP_KERNEL); 2901 2920 if (!edge_serial->bulk_in_buffer) { 2902 - dev_err(&dev->dev, "out of memory\n"); 2903 2921 usb_free_urb(edge_serial->read_urb); 2904 2922 return -ENOMEM; 2905 2923 }
+16 -40
drivers/usb/serial/io_ti.c
··· 364 364 /* Must do a read before write */ 365 365 if (!serial->TiReadI2C) { 366 366 temp = kmalloc(1, GFP_KERNEL); 367 - if (!temp) { 368 - dev_err(&serial->serial->dev->dev, 369 - "%s - out of memory\n", __func__); 367 + if (!temp) 370 368 return -ENOMEM; 371 - } 369 + 372 370 status = read_boot_mem(serial, 0, 1, temp); 373 371 kfree(temp); 374 372 if (status) ··· 469 471 int bytes_left = 0; 470 472 471 473 oedb = kmalloc(sizeof(*oedb), GFP_KERNEL); 472 - if (!oedb) { 473 - dev_err(&port->port->dev, "%s - out of memory\n", __func__); 474 + if (!oedb) 474 475 return -ENOMEM; 475 - } 476 476 477 477 lsr = kmalloc(1, GFP_KERNEL); /* Sigh, that's right, just one byte, 478 478 as not all platforms can do DMA ··· 621 625 __u16 ttype; 622 626 623 627 rom_desc = kmalloc(sizeof(*rom_desc), GFP_KERNEL); 624 - if (!rom_desc) { 625 - dev_err(dev, "%s - out of memory\n", __func__); 628 + if (!rom_desc) 626 629 return -ENOMEM; 627 - } 630 + 628 631 buffer = kmalloc(TI_MAX_I2C_SIZE, GFP_KERNEL); 629 632 if (!buffer) { 630 - dev_err(dev, "%s - out of memory when allocating buffer\n", 631 - __func__); 632 633 kfree(rom_desc); 633 634 return -ENOMEM; 634 635 } ··· 699 706 struct device *dev = &serial->serial->dev->dev; 700 707 701 708 rom_desc = kmalloc(sizeof(*rom_desc), GFP_KERNEL); 702 - if (!rom_desc) { 703 - dev_err(dev, "%s - out of memory\n", __func__); 709 + if (!rom_desc) 704 710 return -ENOMEM; 705 - } 711 + 706 712 start_address = get_descriptor_addr(serial, I2C_DESC_TYPE_ION, 707 713 rom_desc); 708 714 ··· 761 769 sizeof(struct ti_i2c_firmware_rec)); 762 770 763 771 buffer = kmalloc(buffer_size, GFP_KERNEL); 764 - if (!buffer) { 765 - dev_err(dev, "%s - out of memory\n", __func__); 772 + if (!buffer) 766 773 return -ENOMEM; 767 - } 768 774 769 775 // Set entire image of 0xffs 770 776 memset(buffer, 0xff, buffer_size); ··· 822 832 u8 *data; 823 833 824 834 data = kmalloc(1, GFP_KERNEL); 825 - if (!data) { 826 - dev_err(dev, "%s - out of memory\n", __func__); 835 + if (!data) 827 836 return -ENOMEM; 828 - } 829 837 830 838 /* Try to read type 2 */ 831 839 status = ti_vread_sync(serial->serial->dev, UMPC_MEMORY_READ, ··· 974 986 * Read Manufacturing Descriptor from TI Based Edgeport 975 987 */ 976 988 ti_manuf_desc = kmalloc(sizeof(*ti_manuf_desc), GFP_KERNEL); 977 - if (!ti_manuf_desc) { 978 - dev_err(dev, "%s - out of memory.\n", __func__); 989 + if (!ti_manuf_desc) 979 990 return -ENOMEM; 980 - } 991 + 981 992 status = get_manuf_info(serial, (__u8 *)ti_manuf_desc); 982 993 if (status) { 983 994 kfree(ti_manuf_desc); ··· 993 1006 994 1007 rom_desc = kmalloc(sizeof(*rom_desc), GFP_KERNEL); 995 1008 if (!rom_desc) { 996 - dev_err(dev, "%s - out of memory.\n", __func__); 997 1009 kfree(ti_manuf_desc); 998 1010 return -ENOMEM; 999 1011 } ··· 1009 1023 firmware_version = kmalloc(sizeof(*firmware_version), 1010 1024 GFP_KERNEL); 1011 1025 if (!firmware_version) { 1012 - dev_err(dev, "%s - out of memory.\n", __func__); 1013 1026 kfree(rom_desc); 1014 1027 kfree(ti_manuf_desc); 1015 1028 return -ENOMEM; ··· 1053 1068 1054 1069 record = kmalloc(1, GFP_KERNEL); 1055 1070 if (!record) { 1056 - dev_err(dev, "%s - out of memory.\n", 1057 - __func__); 1058 1071 kfree(firmware_version); 1059 1072 kfree(rom_desc); 1060 1073 kfree(ti_manuf_desc); ··· 1136 1153 1137 1154 header = kmalloc(HEADER_SIZE, GFP_KERNEL); 1138 1155 if (!header) { 1139 - dev_err(dev, "%s - out of memory.\n", __func__); 1140 1156 kfree(rom_desc); 1141 1157 kfree(ti_manuf_desc); 1142 1158 return -ENOMEM; ··· 1143 1161 1144 1162 vheader = kmalloc(HEADER_SIZE, GFP_KERNEL); 1145 1163 if (!vheader) { 1146 - dev_err(dev, "%s - out of memory.\n", __func__); 1147 1164 kfree(header); 1148 1165 kfree(rom_desc); 1149 1166 kfree(ti_manuf_desc); ··· 1271 1290 * Read Manufacturing Descriptor from TI Based Edgeport 1272 1291 */ 1273 1292 ti_manuf_desc = kmalloc(sizeof(*ti_manuf_desc), GFP_KERNEL); 1274 - if (!ti_manuf_desc) { 1275 - dev_err(dev, "%s - out of memory.\n", __func__); 1293 + if (!ti_manuf_desc) 1276 1294 return -ENOMEM; 1277 - } 1295 + 1278 1296 status = get_manuf_info(serial, (__u8 *)ti_manuf_desc); 1279 1297 if (status) { 1280 1298 kfree(ti_manuf_desc); ··· 1308 1328 buffer_size = (((1024 * 16) - 512) + 1309 1329 sizeof(struct ti_i2c_image_header)); 1310 1330 buffer = kmalloc(buffer_size, GFP_KERNEL); 1311 - if (!buffer) { 1312 - dev_err(dev, "%s - out of memory\n", __func__); 1331 + if (!buffer) 1313 1332 return -ENOMEM; 1314 - } 1315 1333 1316 1334 /* Initialize the buffer to 0xff (pad the buffer) */ 1317 1335 memset(buffer, 0xff, buffer_size); ··· 2100 2122 config = kmalloc (sizeof (*config), GFP_KERNEL); 2101 2123 if (!config) { 2102 2124 tty->termios = *old_termios; 2103 - dev_err(dev, "%s - out of memory\n", __func__); 2104 2125 return; 2105 2126 } 2106 2127 ··· 2370 2393 2371 2394 /* create our private serial structure */ 2372 2395 edge_serial = kzalloc(sizeof(struct edgeport_serial), GFP_KERNEL); 2373 - if (edge_serial == NULL) { 2374 - dev_err(&serial->dev->dev, "%s - Out of memory\n", __func__); 2396 + if (!edge_serial) 2375 2397 return -ENOMEM; 2376 - } 2398 + 2377 2399 mutex_init(&edge_serial->es_lock); 2378 2400 edge_serial->serial = serial; 2379 2401 usb_set_serial_data(serial, edge_serial);
+3 -6
drivers/usb/serial/ir-usb.c
··· 377 377 * send the baud change out on an "empty" data packet 378 378 */ 379 379 urb = usb_alloc_urb(0, GFP_KERNEL); 380 - if (!urb) { 381 - dev_err(&port->dev, "%s - no more urbs\n", __func__); 380 + if (!urb) 382 381 return; 383 - } 382 + 384 383 transfer_buffer = kmalloc(1, GFP_KERNEL); 385 - if (!transfer_buffer) { 386 - dev_err(&port->dev, "%s - out of memory\n", __func__); 384 + if (!transfer_buffer) 387 385 goto err_buf; 388 - } 389 386 390 387 *transfer_buffer = ir_xbof | ir_baud; 391 388
+2 -6
drivers/usb/serial/keyspan.c
··· 1226 1226 1227 1227 dev_dbg(&serial->interface->dev, "%s - alloc for endpoint %d.\n", __func__, endpoint); 1228 1228 urb = usb_alloc_urb(0, GFP_KERNEL); /* No ISO */ 1229 - if (urb == NULL) { 1230 - dev_dbg(&serial->interface->dev, "%s - alloc for endpoint %d failed.\n", __func__, endpoint); 1229 + if (!urb) 1231 1230 return NULL; 1232 - } 1233 1231 1234 1232 if (endpoint == 0) { 1235 1233 /* control EP filled in when used */ ··· 2310 2312 2311 2313 /* Setup private data for serial driver */ 2312 2314 s_priv = kzalloc(sizeof(struct keyspan_serial_private), GFP_KERNEL); 2313 - if (!s_priv) { 2314 - dev_dbg(&serial->dev->dev, "%s - kmalloc for keyspan_serial_private failed.\n", __func__); 2315 + if (!s_priv) 2315 2316 return -ENOMEM; 2316 - } 2317 2317 2318 2318 s_priv->instat_buf = kzalloc(INSTAT_BUFLEN, GFP_KERNEL); 2319 2319 if (!s_priv->instat_buf)
+5 -11
drivers/usb/serial/kl5kusb105.c
··· 182 182 dev_info(&port->serial->dev->dev, "sending SIO Poll request\n"); 183 183 184 184 status_buf = kmalloc(KLSI_STATUSBUF_LEN, GFP_KERNEL); 185 - if (!status_buf) { 186 - dev_err(&port->dev, "%s - out of memory for status buffer.\n", 187 - __func__); 185 + if (!status_buf) 188 186 return -ENOMEM; 189 - } 187 + 190 188 status_buf[0] = 0xff; 191 189 status_buf[1] = 0xff; 192 190 rc = usb_control_msg(port->serial->dev, ··· 271 273 * priv->line_state. 272 274 */ 273 275 cfg = kmalloc(sizeof(*cfg), GFP_KERNEL); 274 - if (!cfg) { 275 - dev_err(&port->dev, "%s - out of memory for config buffer.\n", 276 - __func__); 276 + if (!cfg) 277 277 return -ENOMEM; 278 - } 278 + 279 279 cfg->pktlen = 5; 280 280 cfg->baudrate = kl5kusb105a_sio_b9600; 281 281 cfg->databits = kl5kusb105a_dtb_8; ··· 413 417 speed_t baud; 414 418 415 419 cfg = kmalloc(sizeof(*cfg), GFP_KERNEL); 416 - if (!cfg) { 417 - dev_err(dev, "%s - out of memory for config buffer.\n", __func__); 420 + if (!cfg) 418 421 return; 419 - } 420 422 421 423 /* lock while we are modifying the settings */ 422 424 spin_lock_irqsave(&priv->lock, flags);
+7 -19
drivers/usb/serial/mos7720.c
··· 362 362 363 363 /* create and initialize the control urb and containing urbtracker */ 364 364 urbtrack = kmalloc(sizeof(struct urbtracker), GFP_ATOMIC); 365 - if (urbtrack == NULL) { 366 - dev_err(&usbdev->dev, "out of memory"); 365 + if (!urbtrack) 367 366 return -ENOMEM; 368 - } 367 + 369 368 kref_get(&mos_parport->ref_count); 370 369 urbtrack->mos_parport = mos_parport; 371 370 urbtrack->urb = usb_alloc_urb(0, GFP_ATOMIC); 372 - if (urbtrack->urb == NULL) { 373 - dev_err(&usbdev->dev, "out of urbs"); 371 + if (!urbtrack->urb) { 374 372 kfree(urbtrack); 375 373 return -ENOMEM; 376 374 } ··· 700 702 701 703 /* allocate and initialize parallel port control struct */ 702 704 mos_parport = kzalloc(sizeof(struct mos7715_parport), GFP_KERNEL); 703 - if (mos_parport == NULL) { 704 - dev_dbg(&serial->dev->dev, "%s: kzalloc failed\n", __func__); 705 + if (!mos_parport) 705 706 return -ENOMEM; 706 - } 707 + 707 708 mos_parport->msg_pending = false; 708 709 kref_init(&mos_parport->ref_count); 709 710 spin_lock_init(&mos_parport->listlock); ··· 1015 1018 for (j = 0; j < NUM_URBS; ++j) { 1016 1019 urb = usb_alloc_urb(0, GFP_KERNEL); 1017 1020 mos7720_port->write_urb_pool[j] = urb; 1018 - 1019 - if (urb == NULL) { 1020 - dev_err(&port->dev, "No more urbs???\n"); 1021 + if (!urb) 1021 1022 continue; 1022 - } 1023 1023 1024 1024 urb->transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE, 1025 1025 GFP_KERNEL); 1026 1026 if (!urb->transfer_buffer) { 1027 - dev_err(&port->dev, 1028 - "%s-out of memory for urb buffers.\n", 1029 - __func__); 1030 1027 usb_free_urb(mos7720_port->write_urb_pool[j]); 1031 1028 mos7720_port->write_urb_pool[j] = NULL; 1032 1029 continue; ··· 1241 1250 if (urb->transfer_buffer == NULL) { 1242 1251 urb->transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE, 1243 1252 GFP_KERNEL); 1244 - if (urb->transfer_buffer == NULL) { 1245 - dev_err_console(port, "%s no more kernel memory...\n", 1246 - __func__); 1253 + if (!urb->transfer_buffer) 1247 1254 goto exit; 1248 - } 1249 1255 } 1250 1256 transfer_size = min(count, URB_TRANSFER_BUFFER_SIZE); 1251 1257
+3 -15
drivers/usb/serial/mos7840.c
··· 876 876 for (j = 0; j < NUM_URBS; ++j) { 877 877 urb = usb_alloc_urb(0, GFP_KERNEL); 878 878 mos7840_port->write_urb_pool[j] = urb; 879 - 880 - if (urb == NULL) { 881 - dev_err(&port->dev, "No more urbs???\n"); 879 + if (!urb) 882 880 continue; 883 - } 884 881 885 882 urb->transfer_buffer = kmalloc(URB_TRANSFER_BUFFER_SIZE, 886 883 GFP_KERNEL); 887 884 if (!urb->transfer_buffer) { 888 885 usb_free_urb(urb); 889 886 mos7840_port->write_urb_pool[j] = NULL; 890 - dev_err(&port->dev, 891 - "%s-out of memory for urb buffers.\n", 892 - __func__); 893 887 continue; 894 888 } 895 889 } ··· 1375 1381 if (urb->transfer_buffer == NULL) { 1376 1382 urb->transfer_buffer = 1377 1383 kmalloc(URB_TRANSFER_BUFFER_SIZE, GFP_KERNEL); 1378 - 1379 - if (urb->transfer_buffer == NULL) { 1380 - dev_err_console(port, "%s no more kernel memory...\n", 1381 - __func__); 1384 + if (!urb->transfer_buffer) 1382 1385 goto exit; 1383 - } 1384 1386 } 1385 1387 transfer_size = min(count, URB_TRANSFER_BUFFER_SIZE); 1386 1388 ··· 2196 2206 2197 2207 dev_dbg(&port->dev, "mos7840_startup: configuring port %d\n", pnum); 2198 2208 mos7840_port = kzalloc(sizeof(struct moschip_port), GFP_KERNEL); 2199 - if (mos7840_port == NULL) { 2200 - dev_err(&port->dev, "%s - Out of memory\n", __func__); 2209 + if (!mos7840_port) 2201 2210 return -ENOMEM; 2202 - } 2203 2211 2204 2212 /* Initialize all port interrupt end point to port 0 int 2205 2213 * endpoint. Our device has only one interrupt end point
-4
drivers/usb/serial/opticon.c
··· 200 200 201 201 buffer = kmalloc(count, GFP_ATOMIC); 202 202 if (!buffer) { 203 - dev_err(&port->dev, "out of memory\n"); 204 203 count = -ENOMEM; 205 - 206 204 goto error_no_buffer; 207 205 } 208 206 209 207 urb = usb_alloc_urb(0, GFP_ATOMIC); 210 208 if (!urb) { 211 - dev_err(&port->dev, "no more free urbs\n"); 212 209 count = -ENOMEM; 213 210 goto error_no_urb; 214 211 } ··· 218 221 * to transmit data to de barcode device the control endpoint is used */ 219 222 dr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_NOIO); 220 223 if (!dr) { 221 - dev_err(&port->dev, "out of memory\n"); 222 224 count = -ENOMEM; 223 225 goto error_no_dr; 224 226 }
+4 -9
drivers/usb/serial/oti6858.c
··· 200 200 int result; 201 201 202 202 new_setup = kmalloc(OTI6858_CTRL_PKT_SIZE, GFP_KERNEL); 203 - if (new_setup == NULL) { 204 - dev_err(&port->dev, "%s(): out of memory!\n", __func__); 203 + if (!new_setup) { 205 204 /* we will try again */ 206 205 schedule_delayed_work(&priv->delayed_setup_work, 207 206 msecs_to_jiffies(2)); ··· 286 287 287 288 if (count != 0) { 288 289 allow = kmalloc(1, GFP_KERNEL); 289 - if (!allow) { 290 - dev_err_console(port, "%s(): kmalloc failed\n", 291 - __func__); 290 + if (!allow) 292 291 return; 293 - } 292 + 294 293 result = usb_control_msg(port->serial->dev, 295 294 usb_rcvctrlpipe(port->serial->dev, 0), 296 295 OTI6858_REQ_T_CHECK_TXBUFF, ··· 514 517 usb_clear_halt(serial->dev, port->read_urb->pipe); 515 518 516 519 buf = kmalloc(OTI6858_CTRL_PKT_SIZE, GFP_KERNEL); 517 - if (buf == NULL) { 518 - dev_err(&port->dev, "%s(): out of memory!\n", __func__); 520 + if (!buf) 519 521 return -ENOMEM; 520 - } 521 522 522 523 result = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), 523 524 OTI6858_REQ_T_GET_STATUS,
-1
drivers/usb/serial/pl2303.c
··· 346 346 347 347 buf = kzalloc(7, GFP_KERNEL); 348 348 if (!buf) { 349 - dev_err(&port->dev, "%s - out of memory.\n", __func__); 350 349 /* Report back no change occurred */ 351 350 if (old_termios) 352 351 tty->termios = *old_termios;
+2 -6
drivers/usb/serial/quatech2.c
··· 676 676 677 677 serial_priv = usb_get_serial_data(serial); 678 678 serial_priv->read_urb = usb_alloc_urb(0, GFP_KERNEL); 679 - if (!serial_priv->read_urb) { 680 - dev_err(&serial->dev->dev, "No free urbs available\n"); 679 + if (!serial_priv->read_urb) 681 680 return -ENOMEM; 682 - } 683 681 684 682 usb_fill_bulk_urb(serial_priv->read_urb, serial->dev, 685 683 usb_rcvbulkpipe(serial->dev, ··· 713 715 } 714 716 715 717 serial_priv = kzalloc(sizeof(*serial_priv), GFP_KERNEL); 716 - if (!serial_priv) { 717 - dev_err(&serial->dev->dev, "%s - Out of memory\n", __func__); 718 + if (!serial_priv) 718 719 return -ENOMEM; 719 - } 720 720 721 721 serial_priv->read_buffer = kmalloc(QT2_READ_BUFFER_SIZE, GFP_KERNEL); 722 722 if (!serial_priv->read_buffer) {
+1 -9
drivers/usb/serial/sierra.c
··· 497 497 498 498 buffer = kmalloc(writesize, GFP_ATOMIC); 499 499 if (!buffer) { 500 - dev_err(&port->dev, "out of memory\n"); 501 500 retval = -ENOMEM; 502 501 goto error_no_buffer; 503 502 } 504 503 505 504 urb = usb_alloc_urb(0, GFP_ATOMIC); 506 505 if (!urb) { 507 - dev_err(&port->dev, "no more free urbs\n"); 508 506 retval = -ENOMEM; 509 507 goto error_no_urb; 510 508 } ··· 734 736 return NULL; 735 737 736 738 urb = usb_alloc_urb(0, mem_flags); 737 - if (urb == NULL) { 738 - dev_dbg(&serial->dev->dev, "%s: alloc for endpoint %d failed\n", 739 - __func__, endpoint); 739 + if (!urb) 740 740 return NULL; 741 - } 742 741 743 742 buf = kmalloc(len, mem_flags); 744 743 if (buf) { ··· 747 752 dev_dbg(&serial->dev->dev, "%s %c u : %p d:%p\n", __func__, 748 753 dir == USB_DIR_IN ? 'i' : 'o', urb, buf); 749 754 } else { 750 - dev_dbg(&serial->dev->dev, "%s %c u:%p d:%p\n", __func__, 751 - dir == USB_DIR_IN ? 'i' : 'o', urb, buf); 752 - 753 755 sierra_release_urb(urb); 754 756 urb = NULL; 755 757 }
+5 -13
drivers/usb/serial/ti_usb_3410_5052.c
··· 301 301 302 302 /* create device structure */ 303 303 tdev = kzalloc(sizeof(struct ti_device), GFP_KERNEL); 304 - if (tdev == NULL) { 305 - dev_err(&dev->dev, "%s - out of memory\n", __func__); 304 + if (!tdev) 306 305 return -ENOMEM; 307 - } 306 + 308 307 mutex_init(&tdev->td_open_close_lock); 309 308 tdev->td_serial = serial; 310 309 usb_set_serial_data(serial, tdev); ··· 721 722 return; 722 723 723 724 config = kmalloc(sizeof(*config), GFP_KERNEL); 724 - if (!config) { 725 - dev_err(&port->dev, "%s - out of memory\n", __func__); 725 + if (!config) 726 726 return; 727 - } 728 727 729 728 config->wFlags = 0; 730 729 ··· 1191 1194 1192 1195 size = sizeof(struct ti_port_status); 1193 1196 data = kmalloc(size, GFP_KERNEL); 1194 - if (!data) { 1195 - dev_err(&port->dev, "%s - out of memory\n", __func__); 1197 + if (!data) 1196 1198 return -ENOMEM; 1197 - } 1198 1199 1199 1200 status = ti_command_in_sync(tdev, TI_GET_PORT_STATUS, 1200 1201 (__u8)(TI_UART1_PORT+port_number), 0, (__u8 *)data, size); ··· 1392 1397 1393 1398 size = sizeof(struct ti_write_data_bytes) + 2; 1394 1399 data = kmalloc(size, GFP_KERNEL); 1395 - if (!data) { 1396 - dev_err(&port->dev, "%s - out of memory\n", __func__); 1400 + if (!data) 1397 1401 return -ENOMEM; 1398 - } 1399 1402 1400 1403 data->bAddrType = TI_RW_DATA_ADDR_XDATA; 1401 1404 data->bDataType = TI_RW_DATA_BYTE; ··· 1509 1516 status = ti_do_download(dev, pipe, buffer, fw_p->size); 1510 1517 kfree(buffer); 1511 1518 } else { 1512 - dev_dbg(&dev->dev, "%s ENOMEM\n", __func__); 1513 1519 status = -ENOMEM; 1514 1520 } 1515 1521 release_firmware(fw_p);
+1 -5
drivers/usb/serial/usb_wwan.c
··· 447 447 struct urb *urb; 448 448 449 449 urb = usb_alloc_urb(0, GFP_KERNEL); /* No ISO */ 450 - if (urb == NULL) { 451 - dev_dbg(&serial->interface->dev, 452 - "%s: alloc for endpoint %d failed.\n", __func__, 453 - endpoint); 450 + if (!urb) 454 451 return NULL; 455 - } 456 452 457 453 /* Fill URB using supplied data. */ 458 454 usb_fill_bulk_urb(urb, serial->dev,
+2 -8
drivers/usb/serial/visor.c
··· 324 324 int num_ports = 0; 325 325 326 326 transfer_buffer = kmalloc(sizeof(*connection_info), GFP_KERNEL); 327 - if (!transfer_buffer) { 328 - dev_err(dev, "%s - kmalloc(%Zd) failed.\n", __func__, 329 - sizeof(*connection_info)); 327 + if (!transfer_buffer) 330 328 return -ENOMEM; 331 - } 332 329 333 330 /* send a get connection info request */ 334 331 retval = usb_control_msg(serial->dev, ··· 416 419 int retval; 417 420 418 421 transfer_buffer = kmalloc(sizeof(*connection_info), GFP_KERNEL); 419 - if (!transfer_buffer) { 420 - dev_err(dev, "%s - kmalloc(%Zd) failed.\n", __func__, 421 - sizeof(*connection_info)); 422 + if (!transfer_buffer) 422 423 return -ENOMEM; 423 - } 424 424 425 425 retval = usb_control_msg(serial->dev, 426 426 usb_rcvctrlpipe(serial->dev, 0),
+1 -5
drivers/usb/serial/whiteheat.c
··· 288 288 289 289 command_info = kmalloc(sizeof(struct whiteheat_command_private), 290 290 GFP_KERNEL); 291 - if (command_info == NULL) { 292 - dev_err(&serial->dev->dev, 293 - "%s: Out of memory for port structures\n", 294 - serial->type->description); 291 + if (!command_info) 295 292 goto no_command_private; 296 - } 297 293 298 294 mutex_init(&command_info->mutex); 299 295 command_info->port_running = 0;