Commit 0315c0b5 authored by Yan Zhen's avatar Yan Zhen Committed by Marc Kleine-Budde
Browse files

can: kvaser_usb: Simplify with dev_err_probe() 



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: default avatarYan Zhen <yanzhen@vivo.com>
Link: https://patch.msgid.link/20240830110651.519119-1-yanzhen@vivo.com


mkl: fix indention
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent a9c0fb33

drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c

+16 −26
Original line number Diff line number Diff line
@@ -898,10 +898,8 @@ static int kvaser_usb_probe(struct usb_interface *intf, 
	ops = driver_info->ops;



	err = ops->dev_setup_endpoints(dev);

	if (err) {

		dev_err(&intf->dev, "Cannot get usb endpoint(s)");

		return err;

	}

	if (err)

		return dev_err_probe(&intf->dev, err, "Cannot get usb endpoint(s)");



	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.capabilities = 0;

	err = ops->dev_init_card(dev);

	if (err) {

		dev_err(&intf->dev,

			"Failed to initialize card, error %d\n", err);

		return err;

	}

	if (err)

		return dev_err_probe(&intf->dev, err,

				     "Failed to initialize card\n");



	err = ops->dev_get_software_info(dev);

	if (err) {

		dev_err(&intf->dev,

			"Cannot get software info, error %d\n", err);

		return err;

	}

	if (err)

		return dev_err_probe(&intf->dev, err,

				     "Cannot get software info\n");



	if (ops->dev_get_software_details) {

		err = ops->dev_get_software_details(dev);

		if (err) {

			dev_err(&intf->dev,

				"Cannot get software details, error %d\n", err);

			return err;

		}

		if (err)

			return dev_err_probe(&intf->dev, err,

					     "Cannot get software details\n");

	}



	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);



	err = ops->dev_get_card_info(dev);

	if (err) {

		dev_err(&intf->dev, "Cannot get card info, error %d\n", err);

		return err;

	}

	if (err)

		return dev_err_probe(&intf->dev, err,

				     "Cannot get card info\n");



	if (ops->dev_get_capabilities) {

		err = ops->dev_get_capabilities(dev);

		if (err) {

			dev_err(&intf->dev,

				"Cannot get capabilities, error %d\n", err);

			kvaser_usb_remove_interfaces(dev);

			return err;

			return dev_err_probe(&intf->dev, err,

					     "Cannot get capabilities\n");

		}

	}