mmc: vub300: rename probe error labels

Error labels should be named after what they do.

Rename the probe error labels.

Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c
index 3c9df27f9fa74d6f6974ffa3ed5f43043fee2f68..3057a69ff8c48481422afadad15a8be56aec3eac 100644 (file)
--- a/drivers/mmc/host/vub300.c
+++ b/drivers/mmc/host/vub300.c
@@ -2107,19 +2107,19 @@ static int vub300_probe(struct usb_interface *interface,
        command_out_urb = usb_alloc_urb(0, GFP_KERNEL);
        if (!command_out_urb) {
                retval = -ENOMEM;
-               goto error0;
+               goto err_put_udev;
        }
        command_res_urb = usb_alloc_urb(0, GFP_KERNEL);
        if (!command_res_urb) {
                retval = -ENOMEM;
-               goto error1;
+               goto err_free_out_urb;
        }
        /* this also allocates memory for our VUB300 mmc host device */
        mmc = mmc_alloc_host(sizeof(*vub300), &udev->dev);
        if (!mmc) {
                retval = -ENOMEM;
                dev_err(&udev->dev, "not enough memory for the mmc_host\n");
-               goto error4;
+               goto err_free_res_urb;
        }
        /* MMC core transfer sizes tunable parameters */
        mmc->caps = 0;
@@ -2336,10 +2336,11 @@ static int vub300_probe(struct usb_interface *interface,
                         interface_to_InterfaceNumber(interface));
        retval = mmc_add_host(mmc);
        if (retval)
-               goto error6;
+               goto err_delete_timer;
 
        return 0;
-error6:
+
+err_delete_timer:
        timer_delete_sync(&vub300->inactivity_timer);
 err_free_host:
        mmc_free_host(mmc);
@@ -2347,12 +2348,13 @@ err_free_host:
         * and hence also frees vub300
         * which is contained at the end of struct mmc
         */
-error4:
+err_free_res_urb:
        usb_free_urb(command_res_urb);
-error1:
+err_free_out_urb:
        usb_free_urb(command_out_urb);
-error0:
+err_put_udev:
        usb_put_dev(udev);
+
        return retval;
 }