Bluetooth: hci_qca: unduplicate calls to hci_uart_register_device()

Now that all three branches of the switch end up doing the same thing,
we can move the call to hci_uart_register_device() past it and unify the
error message.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index ace920261aa43f0e0409144f86b0412a4ea6f6e3..9d2b50c8fc93adfda149f4f0194d36e8fa13827f 100644 (file)
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -2396,12 +2396,6 @@ static int qca_serdev_probe(struct serdev_device *serdev)
                        dev_err(&serdev->dev, "failed to acquire clk\n");
                        return PTR_ERR(qcadev->susclk);
                }
-
-               err = hci_uart_register_device(&qcadev->serdev_hu, &qca_proto);
-               if (err) {
-                       BT_ERR("wcn3990 serdev registration failed");
-                       return err;
-               }
                break;
 
        case QCA_QCA6390:
@@ -2409,12 +2403,6 @@ static int qca_serdev_probe(struct serdev_device *serdev)
                                                           "bluetooth");
                if (IS_ERR(qcadev->bt_power->pwrseq))
                        return PTR_ERR(qcadev->bt_power->pwrseq);
-
-               err = hci_uart_register_device(&qcadev->serdev_hu, &qca_proto);
-               if (err) {
-                       BT_ERR("qca6390 serdev registration failed");
-                       return err;
-               }
                break;
 
        default:
@@ -2447,11 +2435,12 @@ static int qca_serdev_probe(struct serdev_device *serdev)
                if (err)
                        return err;
 
-               err = hci_uart_register_device(&qcadev->serdev_hu, &qca_proto);
-               if (err) {
-                       BT_ERR("Rome serdev registration failed");
-                       return err;
-               }
+       }
+       
+       err = hci_uart_register_device(&qcadev->serdev_hu, &qca_proto);
+       if (err) {
+               BT_ERR("serdev registration failed");
+               return err;
        }
 
        hdev = qcadev->serdev_hu.hdev;