Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-02 09:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

can: kvaser_usb: Simplify with dev_err_probe()

Browse Source 
dev_err_probe() is used to log an error message during the probe process
of a device.

It can simplify the error path and unify a message template.

Using this helper is totally fine even if err is known to never
be -EPROBE_DEFER.

The benefit compared to a normal dev_err() is the standardized format
of the error code, it being emitted symbolically and the fact that
the error code is returned which allows more compact error paths.

Signed-off-by: Yan Zhen <yanzhen@vivo.com>
Link: https://patch.msgid.link/20240830110651.519119-1-yanzhen@vivo.com
mkl: fix indention
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Yan Zhen 2024-08-30 19:06:51 +08:00 committed by Marc Kleine-Budde
parent a9c0fb33fd
commit 0315c0b5ed
1 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
View File

@ -898,10 +898,8 @@ static int kvaser_usb_probe(struct usb_interface *intf,
ops = driver_info->ops; ops = driver_info->ops;
err = ops->dev_setup_endpoints(dev); err = ops->dev_setup_endpoints(dev);
if (err) { if (err)
dev_err(&intf->dev, "Cannot get usb endpoint(s)"); return dev_err_probe(&intf->dev, err, "Cannot get usb endpoint(s)");
return err;
}
dev->udev = interface_to_usbdev(intf); dev->udev = interface_to_usbdev(intf);
@ -912,26 +910,20 @@ static int kvaser_usb_probe(struct usb_interface *intf,
dev->card_data.ctrlmode_supported = 0; dev->card_data.ctrlmode_supported = 0;
dev->card_data.capabilities = 0; dev->card_data.capabilities = 0;
err = ops->dev_init_card(dev); err = ops->dev_init_card(dev);
if (err) { if (err)
dev_err(&intf->dev, return dev_err_probe(&intf->dev, err,
"Failed to initialize card, error %d\n", err); "Failed to initialize card\n");
return err;
}
err = ops->dev_get_software_info(dev); err = ops->dev_get_software_info(dev);
if (err) { if (err)
dev_err(&intf->dev, return dev_err_probe(&intf->dev, err,
"Cannot get software info, error %d\n", err); "Cannot get software info\n");
return err;
}
if (ops->dev_get_software_details) { if (ops->dev_get_software_details) {
err = ops->dev_get_software_details(dev); err = ops->dev_get_software_details(dev);
if (err) { if (err)
dev_err(&intf->dev, return dev_err_probe(&intf->dev, err,
"Cannot get software details, error %d\n", err); "Cannot get software details\n");
return err;
}
} }
if (WARN_ON(!dev->cfg)) if (WARN_ON(!dev->cfg))
@ -945,18 +937,16 @@ static int kvaser_usb_probe(struct usb_interface *intf,
dev_dbg(&intf->dev, "Max outstanding tx = %d URBs\n", dev->max_tx_urbs); dev_dbg(&intf->dev, "Max outstanding tx = %d URBs\n", dev->max_tx_urbs);
err = ops->dev_get_card_info(dev); err = ops->dev_get_card_info(dev);
if (err) { if (err)
dev_err(&intf->dev, "Cannot get card info, error %d\n", err); return dev_err_probe(&intf->dev, err,
return err; "Cannot get card info\n");
}
if (ops->dev_get_capabilities) { if (ops->dev_get_capabilities) {
err = ops->dev_get_capabilities(dev); err = ops->dev_get_capabilities(dev);
if (err) { if (err) {
dev_err(&intf->dev,
"Cannot get capabilities, error %d\n", err);
kvaser_usb_remove_interfaces(dev); kvaser_usb_remove_interfaces(dev);
return err; return dev_err_probe(&intf->dev, err,
"Cannot get capabilities\n");
} }
} }