ionic: simplify returns in devlink info
authorShannon Nelson <snelson@pensando.io>
Tue, 1 Oct 2019 03:03:22 +0000 (20:03 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Oct 2019 15:55:12 +0000 (11:55 -0400)
There is no need for a goto in this bit of code.

Signed-off-by: Shannon Nelson <snelson@pensando.io>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/pensando/ionic/ionic_devlink.c

index af1647a..6fb27dc 100644 (file)
@@ -19,31 +19,30 @@ static int ionic_dl_info_get(struct devlink *dl, struct devlink_info_req *req,
 
        err = devlink_info_driver_name_put(req, IONIC_DRV_NAME);
        if (err)
-               goto info_out;
+               return err;
 
        err = devlink_info_version_running_put(req,
                                               DEVLINK_INFO_VERSION_GENERIC_FW,
                                               idev->dev_info.fw_version);
        if (err)
-               goto info_out;
+               return err;
 
        snprintf(buf, sizeof(buf), "0x%x", idev->dev_info.asic_type);
        err = devlink_info_version_fixed_put(req,
                                             DEVLINK_INFO_VERSION_GENERIC_ASIC_ID,
                                             buf);
        if (err)
-               goto info_out;
+               return err;
 
        snprintf(buf, sizeof(buf), "0x%x", idev->dev_info.asic_rev);
        err = devlink_info_version_fixed_put(req,
                                             DEVLINK_INFO_VERSION_GENERIC_ASIC_REV,
                                             buf);
        if (err)
-               goto info_out;
+               return err;
 
        err = devlink_info_serial_number_put(req, idev->dev_info.serial_num);
 
-info_out:
        return err;
 }