diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2013-10-01 12:19:14 -0700 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2013-10-02 00:36:16 -0700 |
| commit | 4b245722cabc6ee6d56924f10944b14a725ffd61 (patch) | |
| tree | 641320870df1f44d4098a6ebc290cb9e19b2aeee /drivers/bluetooth | |
| parent | 7d5b400cb0018bd23f643adbd413e5e77cce6409 (diff) | |
| download | linux-4b245722cabc6ee6d56924f10944b14a725ffd61.tar.gz linux-4b245722cabc6ee6d56924f10944b14a725ffd61.tar.bz2 linux-4b245722cabc6ee6d56924f10944b14a725ffd61.zip | |
Bluetooth: btmrvl: add setup handler
Move initialization code to hdev's setup handler.
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/btmrvl_main.c | 18 | ||||
| -rw-r--r-- | drivers/bluetooth/btmrvl_sdio.c | 6 |
2 files changed, 16 insertions, 8 deletions
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c index a4da7c830b12..e0ae1f4ea406 100644 --- a/drivers/bluetooth/btmrvl_main.c +++ b/drivers/bluetooth/btmrvl_main.c @@ -432,6 +432,21 @@ static int btmrvl_open(struct hci_dev *hdev) return 0; } +static int btmrvl_setup(struct hci_dev *hdev) +{ + struct btmrvl_private *priv = hci_get_drvdata(hdev); + + btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ); + + priv->btmrvl_dev.psmode = 1; + btmrvl_enable_ps(priv); + + priv->btmrvl_dev.gpio_gap = 0xffff; + btmrvl_send_hscfg_cmd(priv); + + return 0; +} + /* * This function handles the event generated by firmware, rx data * received from firmware, and tx data sent from kernel. @@ -525,8 +540,7 @@ int btmrvl_register_hdev(struct btmrvl_private *priv) hdev->flush = btmrvl_flush; hdev->send = btmrvl_send_frame; hdev->ioctl = btmrvl_ioctl; - - btmrvl_send_module_cfg_cmd(priv, MODULE_BRINGUP_REQ); + hdev->setup = btmrvl_setup; hdev->dev_type = priv->btmrvl_dev.dev_type; diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 00da6df9f71e..5b70bcb38a5e 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c @@ -1046,12 +1046,6 @@ static int btmrvl_sdio_probe(struct sdio_func *func, goto disable_host_int; } - priv->btmrvl_dev.psmode = 1; - btmrvl_enable_ps(priv); - - priv->btmrvl_dev.gpio_gap = 0xffff; - btmrvl_send_hscfg_cmd(priv); - return 0; disable_host_int: |