diff options
Diffstat (limited to 'drivers/usb/serial/ezusb.c')
-rw-r--r-- | drivers/usb/serial/ezusb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/serial/ezusb.c b/drivers/usb/serial/ezusb.c index 3f698baa0abb..cc4fbd9d60be 100644 --- a/drivers/usb/serial/ezusb.c +++ b/drivers/usb/serial/ezusb.c | |||
@@ -27,13 +27,13 @@ int ezusb_writememory (struct usb_serial *serial, int address, unsigned char *da | |||
27 | 27 | ||
28 | /* dbg("ezusb_writememory %x, %d", address, length); */ | 28 | /* dbg("ezusb_writememory %x, %d", address, length); */ |
29 | if (!serial->dev) { | 29 | if (!serial->dev) { |
30 | err("%s - no physical device present, failing.", __FUNCTION__); | 30 | err("%s - no physical device present, failing.", __func__); |
31 | return -ENODEV; | 31 | return -ENODEV; |
32 | } | 32 | } |
33 | 33 | ||
34 | transfer_buffer = kmemdup(data, length, GFP_KERNEL); | 34 | transfer_buffer = kmemdup(data, length, GFP_KERNEL); |
35 | if (!transfer_buffer) { | 35 | if (!transfer_buffer) { |
36 | dev_err(&serial->dev->dev, "%s - kmalloc(%d) failed.\n", __FUNCTION__, length); | 36 | dev_err(&serial->dev->dev, "%s - kmalloc(%d) failed.\n", __func__, length); |
37 | return -ENOMEM; | 37 | return -ENOMEM; |
38 | } | 38 | } |
39 | result = usb_control_msg (serial->dev, usb_sndctrlpipe(serial->dev, 0), bRequest, 0x40, address, 0, transfer_buffer, length, 3000); | 39 | result = usb_control_msg (serial->dev, usb_sndctrlpipe(serial->dev, 0), bRequest, 0x40, address, 0, transfer_buffer, length, 3000); |
@@ -45,10 +45,10 @@ int ezusb_set_reset (struct usb_serial *serial, unsigned char reset_bit) | |||
45 | { | 45 | { |
46 | int response; | 46 | int response; |
47 | 47 | ||
48 | /* dbg("%s - %d", __FUNCTION__, reset_bit); */ | 48 | /* dbg("%s - %d", __func__, reset_bit); */ |
49 | response = ezusb_writememory (serial, CPUCS_REG, &reset_bit, 1, 0xa0); | 49 | response = ezusb_writememory (serial, CPUCS_REG, &reset_bit, 1, 0xa0); |
50 | if (response < 0) | 50 | if (response < 0) |
51 | dev_err(&serial->dev->dev, "%s- %d failed\n", __FUNCTION__, reset_bit); | 51 | dev_err(&serial->dev->dev, "%s- %d failed\n", __func__, reset_bit); |
52 | return response; | 52 | return response; |
53 | } | 53 | } |
54 | 54 | ||