@@ -71,8 +71,8 @@ static int cx82310_cmd(struct usbnet *dev, enum cx82310_cmd cmd, bool reply,
7171 CMD_PACKET_SIZE , & actual_len , CMD_TIMEOUT );
7272 if (ret < 0 ) {
7373 if (cmd != CMD_GET_LINK_STATUS )
74- dev_err ( & dev -> udev -> dev , "send command %#x: error %d\n" ,
75- cmd , ret );
74+ netdev_err ( dev -> net , "send command %#x: error %d\n" ,
75+ cmd , ret );
7676 goto end ;
7777 }
7878
@@ -84,30 +84,27 @@ static int cx82310_cmd(struct usbnet *dev, enum cx82310_cmd cmd, bool reply,
8484 CMD_TIMEOUT );
8585 if (ret < 0 ) {
8686 if (cmd != CMD_GET_LINK_STATUS )
87- dev_err (& dev -> udev -> dev ,
88- "reply receive error %d\n" ,
89- ret );
87+ netdev_err (dev -> net , "reply receive error %d\n" ,
88+ ret );
9089 goto end ;
9190 }
9291 if (actual_len > 0 )
9392 break ;
9493 }
9594 if (actual_len == 0 ) {
96- dev_err (& dev -> udev -> dev , "no reply to command %#x\n" ,
97- cmd );
95+ netdev_err (dev -> net , "no reply to command %#x\n" , cmd );
9896 ret = - EIO ;
9997 goto end ;
10098 }
10199 if (buf [0 ] != cmd ) {
102- dev_err (& dev -> udev -> dev ,
103- "got reply to command %#x, expected: %#x\n" ,
104- buf [0 ], cmd );
100+ netdev_err (dev -> net , "got reply to command %#x, expected: %#x\n" ,
101+ buf [0 ], cmd );
105102 ret = - EIO ;
106103 goto end ;
107104 }
108105 if (buf [1 ] != STATUS_SUCCESS ) {
109- dev_err ( & dev -> udev -> dev , "command %#x failed: %#x\n" ,
110- cmd , buf [1 ]);
106+ netdev_err ( dev -> net , "command %#x failed: %#x\n" , cmd ,
107+ buf [1 ]);
111108 ret = - EIO ;
112109 goto end ;
113110 }
@@ -194,7 +191,7 @@ static int cx82310_bind(struct usbnet *dev, struct usb_interface *intf)
194191 msleep (500 );
195192 }
196193 if (!timeout ) {
197- dev_err ( & udev -> dev , "firmware not ready in time\n" );
194+ netdev_err ( dev -> net , "firmware not ready in time\n" );
198195 ret = - ETIMEDOUT ;
199196 goto err ;
200197 }
@@ -207,7 +204,7 @@ static int cx82310_bind(struct usbnet *dev, struct usb_interface *intf)
207204 ret = cx82310_cmd (dev , CMD_GET_MAC_ADDR , true, NULL , 0 ,
208205 dev -> net -> dev_addr , ETH_ALEN );
209206 if (ret ) {
210- dev_err ( & udev -> dev , "unable to read MAC address: %d\n" , ret );
207+ netdev_err ( dev -> net , "unable to read MAC address: %d\n" , ret );
211208 goto err ;
212209 }
213210
@@ -284,8 +281,7 @@ static int cx82310_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
284281 netdev_info (dev -> net , "router was rebooted, re-enabling ethernet mode" );
285282 schedule_work (& priv -> reenable_work );
286283 } else if (len > CX82310_MTU ) {
287- dev_err (& dev -> udev -> dev , "RX packet too long: %d B\n" ,
288- len );
284+ netdev_err (dev -> net , "RX packet too long: %d B\n" , len );
289285 return 0 ;
290286 }
291287
0 commit comments