diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-20 19:56:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-17 17:41:10 -0400 |
commit | 194343d9364ea07c9f27c4505380a15a905e8a24 (patch) | |
tree | 9c3336daa16fb74f8c669357a7850c2c1452ad8e /drivers/usb/serial/keyspan_pda.c | |
parent | b887265c165f94917d0f565b1883a6e7b3c8388c (diff) |
USB: remove use of err() in drivers/usb/serial
err() is going away, so switch to dev_err() or printk() if it's really
needed.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/keyspan_pda.c')
-rw-r--r-- | drivers/usb/serial/keyspan_pda.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c index 2928ba844394..bf1ae247da66 100644 --- a/drivers/usb/serial/keyspan_pda.c +++ b/drivers/usb/serial/keyspan_pda.c | |||
@@ -742,11 +742,13 @@ static int keyspan_pda_fake_startup(struct usb_serial *serial) | |||
742 | fw_name = "keyspan_pda/xircom_pgs.fw"; | 742 | fw_name = "keyspan_pda/xircom_pgs.fw"; |
743 | #endif | 743 | #endif |
744 | else { | 744 | else { |
745 | err("%s: unknown vendor, aborting.", __func__); | 745 | dev_err(&serial->dev->dev, "%s: unknown vendor, aborting.\n", |
746 | __func__); | ||
746 | return -ENODEV; | 747 | return -ENODEV; |
747 | } | 748 | } |
748 | if (request_ihex_firmware(&fw, fw_name, &serial->dev->dev)) { | 749 | if (request_ihex_firmware(&fw, fw_name, &serial->dev->dev)) { |
749 | err("failed to load firmware \"%s\"\n", fw_name); | 750 | dev_err(&serial->dev->dev, "failed to load firmware \"%s\"\n", |
751 | fw_name); | ||
750 | return -ENOENT; | 752 | return -ENOENT; |
751 | } | 753 | } |
752 | record = (const struct ihex_binrec *)fw->data; | 754 | record = (const struct ihex_binrec *)fw->data; |
@@ -756,10 +758,10 @@ static int keyspan_pda_fake_startup(struct usb_serial *serial) | |||
756 | (unsigned char *)record->data, | 758 | (unsigned char *)record->data, |
757 | be16_to_cpu(record->len), 0xa0); | 759 | be16_to_cpu(record->len), 0xa0); |
758 | if (response < 0) { | 760 | if (response < 0) { |
759 | err("ezusb_writememory failed for Keyspan PDA " | 761 | dev_err(&serial->dev->dev, "ezusb_writememory failed " |
760 | "firmware (%d %04X %p %d)", | 762 | "for Keyspan PDA firmware (%d %04X %p %d)\n", |
761 | response, be32_to_cpu(record->addr), | 763 | response, be32_to_cpu(record->addr), |
762 | record->data, be16_to_cpu(record->len)); | 764 | record->data, be16_to_cpu(record->len)); |
763 | break; | 765 | break; |
764 | } | 766 | } |
765 | record = ihex_next_binrec(record); | 767 | record = ihex_next_binrec(record); |