openharmony/kernel_linux
1
0
Fork 0
mirror of https://gitee.com/openharmony/kernel_linux synced 2025-05-22 06:36:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Deepak Saxena 2005-11-07 01:01:26 -08:00 committed by Linus Torvalds
parent f5e3c2faa2
commit 089b1dbbde
12 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/bluetooth/bcm203x.c
View File

@ -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)) if (ignore || (intf->cur_altsetting->desc.bInterfaceNumber != 0))
return -ENODEV; return -ENODEV;
data = kmalloc(sizeof(*data), GFP_KERNEL); data = kzalloc(sizeof(*data), GFP_KERNEL);
if (!data) { if (!data) {
BT_ERR("Can't allocate memory for data structure"); BT_ERR("Can't allocate memory for data structure");
return -ENOMEM; return -ENOMEM;
} }
memset(data, 0, sizeof(*data));
data->udev = udev; data->udev = udev;
data->state = BCM203X_LOAD_MINIDRV; data->state = BCM203X_LOAD_MINIDRV;

4
drivers/bluetooth/bfusb.c
View File

@ -673,13 +673,11 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
} }
/* Initialize control structure and load firmware */ /* 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"); BT_ERR("Can't allocate memory for control structure");
goto done; goto done;
} }
memset(bfusb, 0, sizeof(struct bfusb));
bfusb->udev = udev; bfusb->udev = udev;
bfusb->bulk_in_ep = bulk_in_ep->desc.bEndpointAddress; bfusb->bulk_in_ep = bulk_in_ep->desc.bEndpointAddress;
bfusb->bulk_out_ep = bulk_out_ep->desc.bEndpointAddress; bfusb->bulk_out_ep = bulk_out_ep->desc.bEndpointAddress;

3
drivers/bluetooth/bluecard_cs.c
View File

@ -870,10 +870,9 @@ static dev_link_t *bluecard_attach(void)
int ret; int ret;
/* Create new info device */ /* Create new info device */
info = kmalloc(sizeof(*info), GFP_KERNEL); info = kzalloc(sizeof(*info), GFP_KERNEL);
if (!info) if (!info)
return NULL; return NULL;
memset(info, 0, sizeof(*info));
link = &info->link; link = &info->link;
link->priv = info; link->priv = info;

4
drivers/bluetooth/bpa10x.c
View File

@ -553,14 +553,12 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id *
if (intf->cur_altsetting->desc.bInterfaceNumber > 0) if (intf->cur_altsetting->desc.bInterfaceNumber > 0)
return -ENODEV; return -ENODEV;
data = kmalloc(sizeof(*data), GFP_KERNEL); data = kzalloc(sizeof(*data), GFP_KERNEL);
if (!data) { if (!data) {
BT_ERR("Can't allocate data structure"); BT_ERR("Can't allocate data structure");
return -ENOMEM; return -ENOMEM;
} }
memset(data, 0, sizeof(*data));
data->udev = udev; data->udev = udev;
rwlock_init(&data->lock); rwlock_init(&data->lock);

3
drivers/bluetooth/bt3c_cs.c
View File

@ -671,10 +671,9 @@ static dev_link_t *bt3c_attach(void)
int ret; int ret;
/* Create new info device */ /* Create new info device */
info = kmalloc(sizeof(*info), GFP_KERNEL); info = kzalloc(sizeof(*info), GFP_KERNEL);
if (!info) if (!info)
return NULL; return NULL;
memset(info, 0, sizeof(*info));
link = &info->link; link = &info->link;
link->priv = info; link->priv = info;

3
drivers/bluetooth/btuart_cs.c
View File

@ -590,10 +590,9 @@ static dev_link_t *btuart_attach(void)
int ret; int ret;
/* Create new info device */ /* Create new info device */
info = kmalloc(sizeof(*info), GFP_KERNEL); info = kzalloc(sizeof(*info), GFP_KERNEL);
if (!info) if (!info)
return NULL; return NULL;
memset(info, 0, sizeof(*info));
link = &info->link; link = &info->link;
link->priv = info; link->priv = info;

3
drivers/bluetooth/dtl1_cs.c
View File

@ -569,10 +569,9 @@ static dev_link_t *dtl1_attach(void)
int ret; int ret;
/* Create new info device */ /* Create new info device */
info = kmalloc(sizeof(*info), GFP_KERNEL); info = kzalloc(sizeof(*info), GFP_KERNEL);
if (!info) if (!info)
return NULL; return NULL;
memset(info, 0, sizeof(*info));
link = &info->link; link = &info->link;
link->priv = info; link->priv = info;

3
drivers/bluetooth/hci_bcsp.c
View File

@ -715,10 +715,9 @@ static int bcsp_open(struct hci_uart *hu)
BT_DBG("hu %p", hu); BT_DBG("hu %p", hu);
bcsp = kmalloc(sizeof(*bcsp), GFP_ATOMIC); bcsp = kzalloc(sizeof(*bcsp), GFP_ATOMIC);
if (!bcsp) if (!bcsp)
return -ENOMEM; return -ENOMEM;
memset(bcsp, 0, sizeof(*bcsp));
hu->priv = bcsp; hu->priv = bcsp;
skb_queue_head_init(&bcsp->unack); skb_queue_head_init(&bcsp->unack);

4
drivers/bluetooth/hci_h4.c
View File

@ -76,12 +76,10 @@ static int h4_open(struct hci_uart *hu)
BT_DBG("hu %p", hu); BT_DBG("hu %p", hu);
h4 = kmalloc(sizeof(*h4), GFP_ATOMIC); h4 = kzalloc(sizeof(*h4), GFP_ATOMIC);
if (!h4) if (!h4)
return -ENOMEM; return -ENOMEM;
memset(h4, 0, sizeof(*h4));
skb_queue_head_init(&h4->txq); skb_queue_head_init(&h4->txq);
hu->priv = h4; hu->priv = h4;

4
drivers/bluetooth/hci_ldisc.c
View File

@ -272,13 +272,11 @@ static int hci_uart_tty_open(struct tty_struct *tty)
if (hu) if (hu)
return -EEXIST; 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"); BT_ERR("Can't allocate controll structure");
return -ENFILE; return -ENFILE;
} }
memset(hu, 0, sizeof(struct hci_uart));
tty->disc_data = hu; tty->disc_data = hu;
hu->tty = tty; hu->tty = tty;

4
drivers/bluetooth/hci_usb.c
View File

@ -875,13 +875,11 @@ static int hci_usb_probe(struct usb_interface *intf, const struct usb_device_id
goto done; 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"); BT_ERR("Can't allocate: control structure");
goto done; goto done;
} }
memset(husb, 0, sizeof(struct hci_usb));
husb->udev = udev; husb->udev = udev;
husb->bulk_out_ep = bulk_out_ep; husb->bulk_out_ep = bulk_out_ep;
husb->bulk_in_ep = bulk_in_ep; husb->bulk_in_ep = bulk_in_ep;

4
drivers/bluetooth/hci_vhci.c
View File

@ -261,12 +261,10 @@ static int vhci_open(struct inode *inode, struct file *file)
struct vhci_data *vhci; struct vhci_data *vhci;
struct hci_dev *hdev; struct hci_dev *hdev;
vhci = kmalloc(sizeof(struct vhci_data), GFP_KERNEL); vhci = kzalloc(sizeof(struct vhci_data), GFP_KERNEL);
if (!vhci) if (!vhci)
return -ENOMEM; return -ENOMEM;
memset(vhci, 0, sizeof(struct vhci_data));
skb_queue_head_init(&vhci->readq); skb_queue_head_init(&vhci->readq);
init_waitqueue_head(&vhci->read_wait); init_waitqueue_head(&vhci->read_wait);