summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-06-13 07:27:19 +0200
committerMarcel Holtmann <marcel@holtmann.org>2009-08-22 14:25:34 -0700
commite0721f99ba33d13a88746732be2d74ca805abf55 (patch)
treeb9ea0a8a934f7586ebeb187c1537d0376eb244de
parent91d697302b291205171840bfe84c1563e171acb2 (diff)
downloadlinux-e0721f99ba33d13a88746732be2d74ca805abf55.tar.gz
linux-e0721f99ba33d13a88746732be2d74ca805abf55.tar.bz2
linux-e0721f99ba33d13a88746732be2d74ca805abf55.zip
Bluetooth: Fix last few compiler warning within Marvell core driver
After fixing the driver to use skb_put properly for their HCI commands only a few compiler warnings are left. Add proper casting for them. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--drivers/bluetooth/btmrvl_main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index f5a3dc5c067c..bbc4446c4b4b 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -172,7 +172,7 @@ int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd)
goto exit;
}
- cmd = skb_put(skb, sizeof(*cmd));
+ cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_MODULE_CFG_REQ));
cmd->length = 1;
cmd->data[0] = subcmd;
@@ -222,7 +222,7 @@ static int btmrvl_enable_hs(struct btmrvl_private *priv)
goto exit;
}
- cmd = skb_put(skb, sizeof(*cmd));
+ cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_HOST_SLEEP_ENABLE));
cmd->length = 0;
@@ -268,7 +268,7 @@ int btmrvl_prepare_command(struct btmrvl_private *priv)
goto exit;
}
- cmd = skb_put(skb, sizeof(*cmd));
+ cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_HOST_SLEEP_CONFIG));
cmd->length = 2;
cmd->data[0] = (priv->btmrvl_dev.gpio_gap & 0xff00) >> 8;
@@ -293,7 +293,7 @@ int btmrvl_prepare_command(struct btmrvl_private *priv)
goto exit;
}
- cmd = skb_put(skb, sizeof(*cmd));
+ cmd = (struct btmrvl_cmd *) skb_put(skb, sizeof(*cmd));
cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_AUTO_SLEEP_MODE));
cmd->length = 1;