aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/irda/mcp2120-sir.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/irda/mcp2120-sir.c')
-rw-r--r--drivers/net/irda/mcp2120-sir.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/irda/mcp2120-sir.c b/drivers/net/irda/mcp2120-sir.c
index 5e2f4859cee7..2e33f91bfe8f 100644
--- a/drivers/net/irda/mcp2120-sir.c
+++ b/drivers/net/irda/mcp2120-sir.c
@@ -63,8 +63,6 @@ static int mcp2120_open(struct sir_dev *dev)
63{ 63{
64 struct qos_info *qos = &dev->qos; 64 struct qos_info *qos = &dev->qos;
65 65
66 IRDA_DEBUG(2, "%s()\n", __func__);
67
68 /* seems no explicit power-on required here and reset switching it on anyway */ 66 /* seems no explicit power-on required here and reset switching it on anyway */
69 67
70 qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200; 68 qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
@@ -76,8 +74,6 @@ static int mcp2120_open(struct sir_dev *dev)
76 74
77static int mcp2120_close(struct sir_dev *dev) 75static int mcp2120_close(struct sir_dev *dev)
78{ 76{
79 IRDA_DEBUG(2, "%s()\n", __func__);
80
81 /* Power off dongle */ 77 /* Power off dongle */
82 /* reset and inhibit mcp2120 */ 78 /* reset and inhibit mcp2120 */
83 sirdev_set_dtr_rts(dev, TRUE, TRUE); 79 sirdev_set_dtr_rts(dev, TRUE, TRUE);
@@ -102,8 +98,6 @@ static int mcp2120_change_speed(struct sir_dev *dev, unsigned speed)
102 u8 control[2]; 98 u8 control[2];
103 static int ret = 0; 99 static int ret = 0;
104 100
105 IRDA_DEBUG(2, "%s()\n", __func__);
106
107 switch (state) { 101 switch (state) {
108 case SIRDEV_STATE_DONGLE_SPEED: 102 case SIRDEV_STATE_DONGLE_SPEED:
109 /* Set DTR to enter command mode */ 103 /* Set DTR to enter command mode */
@@ -155,7 +149,8 @@ static int mcp2120_change_speed(struct sir_dev *dev, unsigned speed)
155 break; 149 break;
156 150
157 default: 151 default:
158 IRDA_ERROR("%s(), undefine state %d\n", __func__, state); 152 net_err_ratelimited("%s(), undefine state %d\n",
153 __func__, state);
159 ret = -EINVAL; 154 ret = -EINVAL;
160 break; 155 break;
161 } 156 }
@@ -187,8 +182,6 @@ static int mcp2120_reset(struct sir_dev *dev)
187 unsigned delay = 0; 182 unsigned delay = 0;
188 int ret = 0; 183 int ret = 0;
189 184
190 IRDA_DEBUG(2, "%s()\n", __func__);
191
192 switch (state) { 185 switch (state) {
193 case SIRDEV_STATE_DONGLE_RESET: 186 case SIRDEV_STATE_DONGLE_RESET:
194 //printk("mcp2120_reset: dongle_reset\n"); 187 //printk("mcp2120_reset: dongle_reset\n");
@@ -213,7 +206,8 @@ static int mcp2120_reset(struct sir_dev *dev)
213 break; 206 break;
214 207
215 default: 208 default:
216 IRDA_ERROR("%s(), undefined state %d\n", __func__, state); 209 net_err_ratelimited("%s(), undefined state %d\n",
210 __func__, state);
217 ret = -EINVAL; 211 ret = -EINVAL;
218 break; 212 break;
219 } 213 }