From: Hans de Goede <hdegoede@redhat.com>
Date: Fri, 24 Sep 2021 11:41:06 +0200
Subject: Bluetooth: hci_h5: directly return hci_uart_register_device() ret-val
Patch-mainline: v5.16-rc1
Git-commit: 6fc165337b0d06670b3b266fc217dd72b080c870
References: jsc#PED-1407
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>
Acked-by: Lee, Chun-Yi <jlee@suse.com>
---
drivers/bluetooth/hci_h5.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -816,7 +816,6 @@ static int h5_serdev_probe(struct 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
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)