Bluetooth: Fix last few compiler warning within Marvell core driver
authorMarcel Holtmann <marcel@holtmann.org>
Sat, 13 Jun 2009 05:27:19 +0000 (07:27 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Sat, 22 Aug 2009 21:25:34 +0000 (14:25 -0700)
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>
drivers/bluetooth/btmrvl_main.c

index f5a3dc5..bbc4446 100644 (file)
@@ -172,7 +172,7 @@ int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd)
                goto exit;
        }
 
                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;
        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;
        }
 
                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;
 
        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;
                }
 
                        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;
                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;
                }
 
                        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;
 
                cmd->ocf_ogf = cpu_to_le16(hci_opcode_pack(OGF, BT_CMD_AUTO_SLEEP_MODE));
                cmd->length = 1;