[PATCH] bluetooth: kmalloc + memset -> kzalloc conversion

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Cc: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

12 files changed, 12 insertions, 31 deletions

diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c
index 5fd3e4cb7525..8e7fb3551775 100644
--- a/drivers/bluetooth/bcm203x.c
+++ b/drivers/bluetooth/bcm203x.c
@@ -179,14 +179,12 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
         if (ignore || (intf->cur_altsetting->desc.bInterfaceNumber != 0))
                 return -ENODEV;
 
-        data = kmalloc(sizeof(*data), GFP_KERNEL);
+        data = kzalloc(sizeof(*data), GFP_KERNEL);
         if (!data) {
                 BT_ERR("Can't allocate memory for data structure");
                 return -ENOMEM;
         }
 
-        memset(data, 0, sizeof(*data));
-
         data->udev  = udev;
         data->state = BCM203X_LOAD_MINIDRV;
 
diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
index 1e9db0156ea7..067e27893e4a 100644
--- a/drivers/bluetooth/bfusb.c
+++ b/drivers/bluetooth/bfusb.c
@@ -673,13 +673,11 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
         }
 
         /* Initialize control structure and load firmware */
-        if (!(bfusb = kmalloc(sizeof(struct bfusb), GFP_KERNEL))) {
+        if (!(bfusb = kzalloc(sizeof(struct bfusb), GFP_KERNEL))) {
                 BT_ERR("Can't allocate memory for control structure");
                 goto done;
         }
 
-        memset(bfusb, 0, sizeof(struct bfusb));
-
         bfusb->udev = udev;
         bfusb->bulk_in_ep    = bulk_in_ep->desc.bEndpointAddress;
         bfusb->bulk_out_ep   = bulk_out_ep->desc.bEndpointAddress;
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index 26fe9c0e1d20..f36c563d72c4 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -870,10 +870,9 @@ static dev_link_t *bluecard_attach(void)
         int ret;
 
         /* Create new info device */
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (!info)
                 return NULL;
-        memset(info, 0, sizeof(*info));
 
         link = &info->link;
         link->priv = info;
diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c
index 0db0400519c9..ecbeb7eaba8e 100644
--- a/drivers/bluetooth/bpa10x.c
+++ b/drivers/bluetooth/bpa10x.c
@@ -553,14 +553,12 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id *
         if (intf->cur_altsetting->desc.bInterfaceNumber > 0)
                 return -ENODEV;
 
-        data = kmalloc(sizeof(*data), GFP_KERNEL);
+        data = kzalloc(sizeof(*data), GFP_KERNEL);
         if (!data) {
                 BT_ERR("Can't allocate data structure");
                 return -ENOMEM;
         }
 
-        memset(data, 0, sizeof(*data));
-
         data->udev = udev;
 
         rwlock_init(&data->lock);
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 2e0338d80f32..d2a0add19cc8 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -671,10 +671,9 @@ static dev_link_t *bt3c_attach(void)
         int ret;
 
         /* Create new info device */
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (!info)
                 return NULL;
-        memset(info, 0, sizeof(*info));
 
         link = &info->link;
         link->priv = info;
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 89486ea7a021..529a28a3209d 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -590,10 +590,9 @@ static dev_link_t *btuart_attach(void)
         int ret;
 
         /* Create new info device */
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (!info)
                 return NULL;
-        memset(info, 0, sizeof(*info));
 
         link = &info->link;
         link->priv = info;
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index 84c1f8839422..dec5980a1cd6 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -569,10 +569,9 @@ static dev_link_t *dtl1_attach(void)
         int ret;
 
         /* Create new info device */
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (!info)
                 return NULL;
-        memset(info, 0, sizeof(*info));
 
         link = &info->link;
         link->priv = info;
diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c
index 0a4761415ac3..8fddfdfd0fbd 100644
--- a/drivers/bluetooth/hci_bcsp.c
+++ b/drivers/bluetooth/hci_bcsp.c
@@ -715,10 +715,9 @@ static int bcsp_open(struct hci_uart *hu)
 
         BT_DBG("hu %p", hu);
 
-        bcsp = kmalloc(sizeof(*bcsp), GFP_ATOMIC);
+        bcsp = kzalloc(sizeof(*bcsp), GFP_ATOMIC);
         if (!bcsp)
                 return -ENOMEM;
-        memset(bcsp, 0, sizeof(*bcsp));
 
         hu->priv = bcsp;
         skb_queue_head_init(&bcsp->unack);
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index 12e369a66fc2..4804d474dc87 100644
--- a/drivers/bluetooth/hci_h4.c
+++ b/drivers/bluetooth/hci_h4.c
@@ -76,12 +76,10 @@ static int h4_open(struct hci_uart *hu)
 
         BT_DBG("hu %p", hu);
 
-        h4 = kmalloc(sizeof(*h4), GFP_ATOMIC);
+        h4 = kzalloc(sizeof(*h4), GFP_ATOMIC);
         if (!h4)
                 return -ENOMEM;
 
-        memset(h4, 0, sizeof(*h4));
-
         skb_queue_head_init(&h4->txq);
 
         hu->priv = h4;
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 4a775f6ea390..573ff6c1be5f 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -272,13 +272,11 @@ static int hci_uart_tty_open(struct tty_struct *tty)
         if (hu)
                 return -EEXIST;
 
-        if (!(hu = kmalloc(sizeof(struct hci_uart), GFP_KERNEL))) {
+        if (!(hu = kzalloc(sizeof(struct hci_uart), GFP_KERNEL))) {
                 BT_ERR("Can't allocate controll structure");
                 return -ENFILE;
         }
 
-        memset(hu, 0, sizeof(struct hci_uart));
-
         tty->disc_data = hu;
         hu->tty = tty;
 
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index 6756cb20b753..f510b25b2c59 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -875,13 +875,11 @@ static int hci_usb_probe(struct usb_interface *intf, const struct usb_device_id
                 goto done;
         }
 
-        if (!(husb = kmalloc(sizeof(struct hci_usb), GFP_KERNEL))) {
+        if (!(husb = kzalloc(sizeof(struct hci_usb), GFP_KERNEL))) {
                 BT_ERR("Can't allocate: control structure");
                 goto done;
         }
 
-        memset(husb, 0, sizeof(struct hci_usb));
-
         husb->udev = udev;
         husb->bulk_out_ep = bulk_out_ep;
         husb->bulk_in_ep  = bulk_in_ep;
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 52cbd45c308f..85738223ff0c 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -261,12 +261,10 @@ static int vhci_open(struct inode *inode, struct file *file)
         struct vhci_data *vhci;
         struct hci_dev *hdev;
 
-        vhci = kmalloc(sizeof(struct vhci_data), GFP_KERNEL);
+        vhci = kzalloc(sizeof(struct vhci_data), GFP_KERNEL);
         if (!vhci)
                 return -ENOMEM;
 
-        memset(vhci, 0, sizeof(struct vhci_data));
-
         skb_queue_head_init(&vhci->readq);
         init_waitqueue_head(&vhci->read_wait);