From: Deepak Saxena Signed-off-by: Deepak Saxena Cc: Marcel Holtmann Signed-off-by: Andrew Morton --- drivers/bluetooth/bcm203x.c | 4 +--- drivers/bluetooth/bfusb.c | 4 +--- drivers/bluetooth/bluecard_cs.c | 3 +-- drivers/bluetooth/bpa10x.c | 4 +--- drivers/bluetooth/bt3c_cs.c | 3 +-- drivers/bluetooth/btuart_cs.c | 3 +-- drivers/bluetooth/dtl1_cs.c | 3 +-- drivers/bluetooth/hci_bcsp.c | 3 +-- drivers/bluetooth/hci_h4.c | 3 +-- drivers/bluetooth/hci_ldisc.c | 3 +-- drivers/bluetooth/hci_usb.c | 7 ++----- drivers/bluetooth/hci_vhci.c | 4 +--- 12 files changed, 13 insertions(+), 31 deletions(-) diff -puN drivers/bluetooth/bcm203x.c~bluetooth-kmalloc-memset-kzalloc-conversion drivers/bluetooth/bcm203x.c --- 25/drivers/bluetooth/bcm203x.c~bluetooth-kmalloc-memset-kzalloc-conversion Tue Oct 11 16:10:26 2005 +++ 25-akpm/drivers/bluetooth/bcm203x.c Tue Oct 11 16:10:26 2005 @@ -179,14 +179,12 @@ static int bcm203x_probe(struct usb_inte 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 -puN drivers/bluetooth/bfusb.c~bluetooth-kmalloc-memset-kzalloc-conversion drivers/bluetooth/bfusb.c --- 25/drivers/bluetooth/bfusb.c~bluetooth-kmalloc-memset-kzalloc-conversion Tue Oct 11 16:10:26 2005 +++ 25-akpm/drivers/bluetooth/bfusb.c Tue Oct 11 16:10:26 2005 @@ -673,13 +673,11 @@ static int bfusb_probe(struct usb_interf } /* 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 -puN drivers/bluetooth/bluecard_cs.c~bluetooth-kmalloc-memset-kzalloc-conversion drivers/bluetooth/bluecard_cs.c --- 25/drivers/bluetooth/bluecard_cs.c~bluetooth-kmalloc-memset-kzalloc-conversion Tue Oct 11 16:10:26 2005 +++ 25-akpm/drivers/bluetooth/bluecard_cs.c Tue Oct 11 16:10:26 2005 @@ -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 -puN drivers/bluetooth/bpa10x.c~bluetooth-kmalloc-memset-kzalloc-conversion drivers/bluetooth/bpa10x.c --- 25/drivers/bluetooth/bpa10x.c~bluetooth-kmalloc-memset-kzalloc-conversion Tue Oct 11 16:10:26 2005 +++ 25-akpm/drivers/bluetooth/bpa10x.c Tue Oct 11 16:10:26 2005 @@ -550,14 +550,12 @@ static int bpa10x_probe(struct usb_inter if (ignore) 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 -puN drivers/bluetooth/bt3c_cs.c~bluetooth-kmalloc-memset-kzalloc-conversion drivers/bluetooth/bt3c_cs.c --- 25/drivers/bluetooth/bt3c_cs.c~bluetooth-kmalloc-memset-kzalloc-conversion Tue Oct 11 16:10:26 2005 +++ 25-akpm/drivers/bluetooth/bt3c_cs.c Tue Oct 11 16:10:26 2005 @@ -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 -puN drivers/bluetooth/btuart_cs.c~bluetooth-kmalloc-memset-kzalloc-conversion drivers/bluetooth/btuart_cs.c --- 25/drivers/bluetooth/btuart_cs.c~bluetooth-kmalloc-memset-kzalloc-conversion Tue Oct 11 16:10:26 2005 +++ 25-akpm/drivers/bluetooth/btuart_cs.c Tue Oct 11 16:10:26 2005 @@ -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 -puN drivers/bluetooth/dtl1_cs.c~bluetooth-kmalloc-memset-kzalloc-conversion drivers/bluetooth/dtl1_cs.c --- 25/drivers/bluetooth/dtl1_cs.c~bluetooth-kmalloc-memset-kzalloc-conversion Tue Oct 11 16:10:26 2005 +++ 25-akpm/drivers/bluetooth/dtl1_cs.c Tue Oct 11 16:10:26 2005 @@ -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 -puN drivers/bluetooth/hci_bcsp.c~bluetooth-kmalloc-memset-kzalloc-conversion drivers/bluetooth/hci_bcsp.c --- 25/drivers/bluetooth/hci_bcsp.c~bluetooth-kmalloc-memset-kzalloc-conversion Tue Oct 11 16:10:26 2005 +++ 25-akpm/drivers/bluetooth/hci_bcsp.c Tue Oct 11 16:10:26 2005 @@ -682,10 +682,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 -puN drivers/bluetooth/hci_h4.c~bluetooth-kmalloc-memset-kzalloc-conversion drivers/bluetooth/hci_h4.c --- 25/drivers/bluetooth/hci_h4.c~bluetooth-kmalloc-memset-kzalloc-conversion Tue Oct 11 16:10:26 2005 +++ 25-akpm/drivers/bluetooth/hci_h4.c Tue Oct 11 16:10:26 2005 @@ -66,10 +66,9 @@ 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); diff -puN drivers/bluetooth/hci_ldisc.c~bluetooth-kmalloc-memset-kzalloc-conversion drivers/bluetooth/hci_ldisc.c --- 25/drivers/bluetooth/hci_ldisc.c~bluetooth-kmalloc-memset-kzalloc-conversion Tue Oct 11 16:10:26 2005 +++ 25-akpm/drivers/bluetooth/hci_ldisc.c Tue Oct 11 16:10:26 2005 @@ -268,11 +268,10 @@ static int hci_uart_tty_open(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 -puN drivers/bluetooth/hci_usb.c~bluetooth-kmalloc-memset-kzalloc-conversion drivers/bluetooth/hci_usb.c --- 25/drivers/bluetooth/hci_usb.c~bluetooth-kmalloc-memset-kzalloc-conversion Tue Oct 11 16:10:26 2005 +++ 25-akpm/drivers/bluetooth/hci_usb.c Tue Oct 11 16:10:26 2005 @@ -875,13 +874,11 @@ static int hci_usb_probe(struct usb_inte 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 -puN drivers/bluetooth/hci_vhci.c~bluetooth-kmalloc-memset-kzalloc-conversion drivers/bluetooth/hci_vhci.c --- 25/drivers/bluetooth/hci_vhci.c~bluetooth-kmalloc-memset-kzalloc-conversion Tue Oct 11 16:10:26 2005 +++ 25-akpm/drivers/bluetooth/hci_vhci.c Tue Oct 11 16:10:26 2005 @@ -261,12 +261,10 @@ static int vhci_open(struct inode *inode 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); _