Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...

[linux-2.6] / drivers / usb / serial / ezusb.c

diff --git a/drivers/usb/serial/ezusb.c b/drivers/usb/serial/ezusb.c
index 97ee718b1da2a29bf08ed4f30e88cff14bb3beb9..cc4fbd9d60be9620532ca5c18da43d9ff406b705 100644 (file)
--- 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
 
        /* dbg("ezusb_writememory %x, %d", address, length); */
        if (!serial->dev) {
-               err("%s - no physical device present, failing.", __FUNCTION__);
+               err("%s - no physical device present, failing.", __func__);
                return -ENODEV;
        }
 
        transfer_buffer = kmemdup(data, length, GFP_KERNEL);
        if (!transfer_buffer) {
-               dev_err(&serial->dev->dev, "%s - kmalloc(%d) failed.\n", __FUNCTION__, length);
+               dev_err(&serial->dev->dev, "%s - kmalloc(%d) failed.\n", __func__, length);
                return -ENOMEM;
        }
        result = usb_control_msg (serial->dev, usb_sndctrlpipe(serial->dev, 0), bRequest, 0x40, address, 0, transfer_buffer, length, 3000);
@@ -45,14 +45,14 @@ int ezusb_set_reset (struct usb_serial *serial, unsigned char reset_bit)
 {
        int response;
 
-       /* dbg("%s - %d", __FUNCTION__, reset_bit); */
+       /* dbg("%s - %d", __func__, reset_bit); */
        response = ezusb_writememory (serial, CPUCS_REG, &reset_bit, 1, 0xa0);
        if (response < 0)
-               dev_err(&serial->dev->dev, "%s- %d failed\n", __FUNCTION__, reset_bit);
+               dev_err(&serial->dev->dev, "%s- %d failed\n", __func__, reset_bit);
        return response;
 }
 
 
-EXPORT_SYMBOL(ezusb_writememory);
-EXPORT_SYMBOL(ezusb_set_reset);
+EXPORT_SYMBOL_GPL(ezusb_writememory);
+EXPORT_SYMBOL_GPL(ezusb_set_reset);