aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2015-12-29 07:36:16 -0500
committerJohan Hovold <johan@kernel.org>2015-12-29 07:43:14 -0500
commit6ff9d2761b8655991f48f113f7edaefea5c92905 (patch)
tree161fd6d5970a3bda93d41b75db6d125c8df66e91
parent3645ea87b9cd50123054aa0fd2417f601c45566f (diff)
USB: mxu11x0: drop redundant function name from error messages
Drop redundant function name from a few error messages. Drop redundant error message when generic open fails. Signed-off-by: Johan Hovold <johan@kernel.org>
-rw-r--r--drivers/usb/serial/mxu11x0.c32
1 files changed, 12 insertions, 20 deletions
diff --git a/drivers/usb/serial/mxu11x0.c b/drivers/usb/serial/mxu11x0.c
index c8c959679827..e3c3f57c2d82 100644
--- a/drivers/usb/serial/mxu11x0.c
+++ b/drivers/usb/serial/mxu11x0.c
@@ -776,24 +776,22 @@ static int mxu1_open(struct tty_struct *tty, struct usb_serial_port *port)
776 status = mxu1_send_ctrl_urb(serial, MXU1_OPEN_PORT, 776 status = mxu1_send_ctrl_urb(serial, MXU1_OPEN_PORT,
777 open_settings, MXU1_UART1_PORT); 777 open_settings, MXU1_UART1_PORT);
778 if (status) { 778 if (status) {
779 dev_err(&port->dev, "%s - cannot send open command: %d\n", 779 dev_err(&port->dev, "cannot send open command: %d\n", status);
780 __func__, status);
781 goto unlink_int_urb; 780 goto unlink_int_urb;
782 } 781 }
783 782
784 status = mxu1_send_ctrl_urb(serial, MXU1_START_PORT, 783 status = mxu1_send_ctrl_urb(serial, MXU1_START_PORT,
785 0, MXU1_UART1_PORT); 784 0, MXU1_UART1_PORT);
786 if (status) { 785 if (status) {
787 dev_err(&port->dev, "%s - cannot send start command: %d\n", 786 dev_err(&port->dev, "cannot send start command: %d\n", status);
788 __func__, status);
789 goto unlink_int_urb; 787 goto unlink_int_urb;
790 } 788 }
791 789
792 status = mxu1_send_ctrl_urb(serial, MXU1_PURGE_PORT, 790 status = mxu1_send_ctrl_urb(serial, MXU1_PURGE_PORT,
793 MXU1_PURGE_INPUT, MXU1_UART1_PORT); 791 MXU1_PURGE_INPUT, MXU1_UART1_PORT);
794 if (status) { 792 if (status) {
795 dev_err(&port->dev, "%s - cannot clear input buffers: %d\n", 793 dev_err(&port->dev, "cannot clear input buffers: %d\n",
796 __func__, status); 794 status);
797 795
798 goto unlink_int_urb; 796 goto unlink_int_urb;
799 } 797 }
@@ -801,8 +799,8 @@ static int mxu1_open(struct tty_struct *tty, struct usb_serial_port *port)
801 status = mxu1_send_ctrl_urb(serial, MXU1_PURGE_PORT, 799 status = mxu1_send_ctrl_urb(serial, MXU1_PURGE_PORT,
802 MXU1_PURGE_OUTPUT, MXU1_UART1_PORT); 800 MXU1_PURGE_OUTPUT, MXU1_UART1_PORT);
803 if (status) { 801 if (status) {
804 dev_err(&port->dev, "%s - cannot clear output buffers: %d\n", 802 dev_err(&port->dev, "cannot clear output buffers: %d\n",
805 __func__, status); 803 status);
806 804
807 goto unlink_int_urb; 805 goto unlink_int_urb;
808 } 806 }
@@ -820,25 +818,20 @@ static int mxu1_open(struct tty_struct *tty, struct usb_serial_port *port)
820 status = mxu1_send_ctrl_urb(serial, MXU1_OPEN_PORT, 818 status = mxu1_send_ctrl_urb(serial, MXU1_OPEN_PORT,
821 open_settings, MXU1_UART1_PORT); 819 open_settings, MXU1_UART1_PORT);
822 if (status) { 820 if (status) {
823 dev_err(&port->dev, "%s - cannot send open command: %d\n", 821 dev_err(&port->dev, "cannot send open command: %d\n", status);
824 __func__, status);
825 goto unlink_int_urb; 822 goto unlink_int_urb;
826 } 823 }
827 824
828 status = mxu1_send_ctrl_urb(serial, MXU1_START_PORT, 825 status = mxu1_send_ctrl_urb(serial, MXU1_START_PORT,
829 0, MXU1_UART1_PORT); 826 0, MXU1_UART1_PORT);
830 if (status) { 827 if (status) {
831 dev_err(&port->dev, "%s - cannot send start command: %d\n", 828 dev_err(&port->dev, "cannot send start command: %d\n", status);
832 __func__, status);
833 goto unlink_int_urb; 829 goto unlink_int_urb;
834 } 830 }
835 831
836 status = usb_serial_generic_open(tty, port); 832 status = usb_serial_generic_open(tty, port);
837 if (status) { 833 if (status)
838 dev_err(&port->dev, "%s - submit read urb failed: %d\n",
839 __func__, status);
840 goto unlink_int_urb; 834 goto unlink_int_urb;
841 }
842 835
843 return 0; 836 return 0;
844 837
@@ -921,8 +914,7 @@ static void mxu1_interrupt_callback(struct urb *urb)
921 } 914 }
922 915
923 if (data[0] == MXU1_CODE_HARDWARE_ERROR) { 916 if (data[0] == MXU1_CODE_HARDWARE_ERROR) {
924 dev_err(&port->dev, "%s - hardware error: %d\n", 917 dev_err(&port->dev, "hardware error: %d\n", data[1]);
925 __func__, data[1]);
926 goto exit; 918 goto exit;
927 } 919 }
928 920
@@ -943,8 +935,8 @@ static void mxu1_interrupt_callback(struct urb *urb)
943 break; 935 break;
944 936
945 default: 937 default:
946 dev_err(&port->dev, "%s - unknown interrupt code: 0x%02X\n", 938 dev_err(&port->dev, "unknown interrupt code: 0x%02X\n",
947 __func__, data[1]); 939 data[1]);
948 break; 940 break;
949 } 941 }
950 942