Bluetooth: hci_h5: directly return hci_uart_register_device() ret-val
authorHans de Goede <hdegoede@redhat.com>
Fri, 24 Sep 2021 09:41:06 +0000 (11:41 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Fri, 24 Sep 2021 09:48:02 +0000 (11:48 +0200)
Since the hci_uart_register_device() call is the last thing we do in
h5_serdev_probe() we can simply directly return its return-value.

Cc: Archie Pusaka <apusaka@google.com>
Suggested-by: Archie Pusaka <apusaka@google.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
drivers/bluetooth/hci_h5.c

index d49a39d17d7dc0445714c881040c9a43b55cf1ca..34286ffe0568fd7033d32f7be86cbb2c70d6032b 100644 (file)
@@ -816,7 +816,6 @@ static int h5_serdev_probe(struct serdev_device *serdev)
        struct device *dev = &serdev->dev;
        struct h5 *h5;
        const struct h5_device_data *data;
-       int err;
 
        h5 = devm_kzalloc(dev, sizeof(*h5), GFP_KERNEL);
        if (!h5)
@@ -860,11 +859,7 @@ static int h5_serdev_probe(struct serdev_device *serdev)
        if (IS_ERR(h5->device_wake_gpio))
                return PTR_ERR(h5->device_wake_gpio);
 
-       err = hci_uart_register_device(&h5->serdev_hu, &h5p);
-       if (err)
-               return err;
-
-       return 0;
+       return hci_uart_register_device(&h5->serdev_hu, &h5p);
 }
 
 static void h5_serdev_remove(struct serdev_device *serdev)