Skip to contentSkip to conversation

kmalloc + memset -> kzalloc conversion

PATCH In review Deepak Saxena 4 participants 7 messages Oct 1, 2005 – Oct 13, 2005

Subsystems (2)
Block layer Bluetooth drivers
lore
Share & tools
lore

Deepak Saxena

author
#0 lore raw

PATCH 1/1 kmalloc + memset -> kzalloc conversion

Signed-off-by Deepak Saxena <[email protected]>
drivers/block/DAC960.c +5 -16
@@ -318,11 +318,10 @@ static boolean DAC960_CreateAuxiliaryStr
 		CommandsRemaining = CommandAllocationGroupSize;
 	  CommandGroupByteCount =
 		CommandsRemaining * CommandAllocationLength;
-	  AllocationPointer = kmalloc(CommandGroupByteCount, GFP_ATOMIC);
+	  AllocationPointer = kzalloc(CommandGroupByteCount, GFP_ATOMIC);
 	  if (AllocationPointer == NULL)
 		return DAC960_Failure(Controller,
 					"AUXILIARY STRUCTURE CREATION");
-	  memset(AllocationPointer, 0, CommandGroupByteCount);
 	 }
       Command = (DAC960_Command_T *) AllocationPointer;
       AllocationPointer += CommandAllocationLength;

@@ -2726,13 +2725,12 @@ DAC960_DetectController(struct pci_dev *
   int i;
 
   Controller = (DAC960_Controller_T *)
-	kmalloc(sizeof(DAC960_Controller_T), GFP_ATOMIC);
+	kzalloc(sizeof(DAC960_Controller_T), GFP_ATOMIC);
   if (Controller == NULL) {
 	DAC960_Error("Unable to allocate Controller structure for "
                        "Controller at\n", NULL);
 	return NULL;
   }
-  memset(Controller, 0, sizeof(DAC960_Controller_T));
   Controller->ControllerNumber = DAC960_ControllerCount;
   DAC960_Controllers[DAC960_ControllerCount++] = Controller;
   Controller->Bus = PCI_Device->bus->number;

@@ -4665,7 +4663,6 @@ static void DAC960_V2_ProcessCompletedCo
 	   */
 	   DAC960_queue_partial_rw(Command);
 	   return;
-	}
       else
 	{
 	  if (Command->V2.RequestSense->SenseKey != DAC960_SenseKey_NotReady)

@@ -4799,10 +4796,10 @@ static void DAC960_V2_ProcessCompletedCo
 	       PhysicalDeviceInfo->LogicalUnit))
 	    {
 	      PhysicalDeviceInfo = (DAC960_V2_PhysicalDeviceInfo_T *)
-		kmalloc(sizeof(DAC960_V2_PhysicalDeviceInfo_T), GFP_ATOMIC);
+		kzalloc(sizeof(DAC960_V2_PhysicalDeviceInfo_T), GFP_ATOMIC);
 	      InquiryUnitSerialNumber =
 		(DAC960_SCSI_Inquiry_UnitSerialNumber_T *)
-		  kmalloc(sizeof(DAC960_SCSI_Inquiry_UnitSerialNumber_T),
+		  kzalloc(sizeof(DAC960_SCSI_Inquiry_UnitSerialNumber_T),
 			  GFP_ATOMIC);
 	      if (InquiryUnitSerialNumber == NULL &&
 		  PhysicalDeviceInfo != NULL)

@@ -4818,12 +4815,8 @@ static void DAC960_V2_ProcessCompletedCo
 			       ? "" : " - Allocation Failed"));
 	      if (PhysicalDeviceInfo != NULL)
 		{
-		  memset(PhysicalDeviceInfo, 0,
-			 sizeof(DAC960_V2_PhysicalDeviceInfo_T));
 		  PhysicalDeviceInfo->PhysicalDeviceState =
 		    DAC960_V2_Device_InvalidState;
-		  memset(InquiryUnitSerialNumber, 0,
-			 sizeof(DAC960_SCSI_Inquiry_UnitSerialNumber_T));
 		  InquiryUnitSerialNumber->PeripheralDeviceType = 0x1F;
 		  for (DeviceIndex = DAC960_V2_MaxPhysicalDevices - 1;
 		       DeviceIndex > PhysicalDeviceIndex;

@@ -4969,7 +4962,7 @@ static void DAC960_V2_ProcessCompletedCo
 	      Controller->V2.LogicalDriveToVirtualDevice[LogicalDeviceNumber] =
 		PhysicalDevice;
 	      LogicalDeviceInfo = (DAC960_V2_LogicalDeviceInfo_T *)
-		kmalloc(sizeof(DAC960_V2_LogicalDeviceInfo_T), GFP_ATOMIC);
+		kzalloc(sizeof(DAC960_V2_LogicalDeviceInfo_T), GFP_ATOMIC);
 	      Controller->V2.LogicalDeviceInformation[LogicalDeviceNumber] =
 		LogicalDeviceInfo;
 	      DAC960_Critical("Logical Drive %d (/dev/rd/c%dd%d) "

@@ -4980,11 +4973,7 @@ static void DAC960_V2_ProcessCompletedCo
 			      (LogicalDeviceInfo != NULL
 			       ? "" : " - Allocation Failed"));
 	      if (LogicalDeviceInfo != NULL)
-		{
-		  memset(LogicalDeviceInfo, 0,
-			 sizeof(DAC960_V2_LogicalDeviceInfo_T));
 		  DAC960_ComputeGenericDiskInfo(Controller);
-		}
 	    }
 	  if (LogicalDeviceInfo != NULL)
 	    {
drivers/block/cciss.c +2 -4
@@ -2733,13 +2733,12 @@ static void cciss_getgeometry(int cntl_n
 	int block_size;
 	int total_size; 
 
-	ld_buff = kmalloc(sizeof(ReportLunData_struct), GFP_KERNEL);
+	ld_buff = kzalloc(sizeof(ReportLunData_struct), GFP_KERNEL);
 	if (ld_buff == NULL)
 	{
 		printk(KERN_ERR "cciss: out of memory\n");
 		return;
 	}
-	memset(ld_buff, 0, sizeof(ReportLunData_struct));
 	size_buff = kmalloc(sizeof( ReadCapdata_struct), GFP_KERNEL);
         if (size_buff == NULL)
         {

@@ -2853,10 +2852,9 @@ static int alloc_cciss_hba(void)
 	for(i=0; i< MAX_CTLR; i++) {
 		if (!hba[i]) {
 			ctlr_info_t *p;
-			p = kmalloc(sizeof(ctlr_info_t), GFP_KERNEL);
+			p = kzalloc(sizeof(ctlr_info_t), GFP_KERNEL);
 			if (!p)
 				goto Enomem;
-			memset(p, 0, sizeof(ctlr_info_t));
 			for (n = 0; n < NWD; n++)
 				p->gendisk[n] = disk[n];
 			hba[i] = p;
drivers/block/cciss_scsi.c +1 -2
@@ -1015,12 +1015,11 @@ cciss_update_non_disk_devices(int cntl_n
 	int i;
 
 	c = (ctlr_info_t *) hba[cntl_num];	
-	ld_buff = kmalloc(reportlunsize, GFP_KERNEL);
+	ld_buff = kzalloc(reportlunsize, GFP_KERNEL);
 	if (ld_buff == NULL) {
 		printk(KERN_ERR "cciss: out of memory\n");
 		return;
 	}
-	memset(ld_buff, 0, reportlunsize);
 	inq_buff = kmalloc(OBDR_TAPE_INQ_SIZE, GFP_KERNEL);
         if (inq_buff == NULL) {
                 printk(KERN_ERR "cciss: out of memory\n");
drivers/block/cfq-iosched.c +1 -3
@@ -2284,12 +2284,10 @@ static int cfq_init_queue(request_queue_
 	struct cfq_data *cfqd;
 	int i;
 
-	cfqd = kmalloc(sizeof(*cfqd), GFP_KERNEL);
+	cfqd = kzalloc(sizeof(*cfqd), GFP_KERNEL);
 	if (!cfqd)
 		return -ENOMEM;
 
-	memset(cfqd, 0, sizeof(*cfqd));
-
 	for (i = 0; i < CFQ_PRIO_LISTS; i++)
 		INIT_LIST_HEAD(&cfqd->rr_list[i]);
drivers/block/cpqarray.c +5 -11
@@ -425,7 +425,7 @@ static int cpqarray_register_ctlr( int i
 	hba[i]->cmd_pool = (cmdlist_t *)pci_alloc_consistent(
 		hba[i]->pci_dev, NR_CMDS * sizeof(cmdlist_t),
 		&(hba[i]->cmd_pool_dhandle));
-	hba[i]->cmd_pool_bits = kmalloc(
+	hba[i]->cmd_pool_bits = kzalloc(
 		((NR_CMDS+BITS_PER_LONG-1)/BITS_PER_LONG)*sizeof(unsigned long),
 		GFP_KERNEL);
 

@@ -433,7 +433,6 @@ static int cpqarray_register_ctlr( int i
 			goto Enomem1;
 
 	memset(hba[i]->cmd_pool, 0, NR_CMDS * sizeof(cmdlist_t));
-	memset(hba[i]->cmd_pool_bits, 0, ((NR_CMDS+BITS_PER_LONG-1)/BITS_PER_LONG)*sizeof(unsigned long));
 	printk(KERN_INFO "cpqarray: Finding drives on %s",
 		hba[i]->devname);
 

@@ -1655,14 +1654,14 @@ static void getgeometry(int ctlr)
 
 	info_p->log_drv_map = 0;	
 	
-	id_ldrive = (id_log_drv_t *)kmalloc(sizeof(id_log_drv_t), GFP_KERNEL);
+	id_ldrive = (id_log_drv_t *)kzalloc(sizeof(id_log_drv_t), GFP_KERNEL);
 	if(id_ldrive == NULL)
 	{
 		printk( KERN_ERR "cpqarray:  out of memory.\n");
 		return;
 	}
 
-	id_ctlr_buf = (id_ctlr_t *)kmalloc(sizeof(id_ctlr_t), GFP_KERNEL);
+	id_ctlr_buf = (id_ctlr_t *)kzalloc(sizeof(id_ctlr_t), GFP_KERNEL);
 	if(id_ctlr_buf == NULL)
 	{
 		kfree(id_ldrive);

@@ -1670,7 +1669,7 @@ static void getgeometry(int ctlr)
 		return;
 	}
 
-	id_lstatus_buf = (sense_log_drv_stat_t *)kmalloc(sizeof(sense_log_drv_stat_t), GFP_KERNEL);
+	id_lstatus_buf = (sense_log_drv_stat_t *)kzalloc(sizeof(sense_log_drv_stat_t), GFP_KERNEL);
 	if(id_lstatus_buf == NULL)
 	{
 		kfree(id_ctlr_buf);

@@ -1679,7 +1678,7 @@ static void getgeometry(int ctlr)
 		return;
 	}
 
-	sense_config_buf = (config_t *)kmalloc(sizeof(config_t), GFP_KERNEL);
+	sense_config_buf = (config_t *)kzalloc(sizeof(config_t), GFP_KERNEL);
 	if(sense_config_buf == NULL)
 	{
 		kfree(id_lstatus_buf);

@@ -1689,11 +1688,6 @@ static void getgeometry(int ctlr)
 		return;
 	}
 
-	memset(id_ldrive, 0, sizeof(id_log_drv_t));
-	memset(id_ctlr_buf, 0, sizeof(id_ctlr_t));
-	memset(id_lstatus_buf, 0, sizeof(sense_log_drv_stat_t));
-	memset(sense_config_buf, 0, sizeof(config_t));
-
 	info_p->phys_drives = 0;
 	info_p->log_drv_map = 0;
 	info_p->drv_assign_map = 0;
drivers/block/ll_rw_blk.c +2 -4
@@ -788,17 +788,15 @@ init_tag_map(request_queue_t *q, struct 
 				__FUNCTION__, depth);
 	}
 
-	tag_index = kmalloc(depth * sizeof(struct request *), GFP_ATOMIC);
+	tag_index = kzalloc(depth * sizeof(struct request *), GFP_ATOMIC);
 	if (!tag_index)
 		goto fail;
 
 	nr_ulongs = ALIGN(depth, BITS_PER_LONG) / BITS_PER_LONG;
-	tag_map = kmalloc(nr_ulongs * sizeof(unsigned long), GFP_ATOMIC);
+	tag_map = kzalloc(nr_ulongs * sizeof(unsigned long), GFP_ATOMIC);
 	if (!tag_map)
 		goto fail;
 
-	memset(tag_index, 0, depth * sizeof(struct request *));
-	memset(tag_map, 0, nr_ulongs * sizeof(unsigned long));
 	tags->real_max_depth = depth;
 	tags->max_depth = depth;
 	tags->tag_index = tag_index;
drivers/block/loop.c +1 -3
@@ -1250,10 +1250,9 @@ static int __init loop_init(void)
 	if (register_blkdev(LOOP_MAJOR, "loop"))
 		return -EIO;
 
-	loop_dev = kmalloc(max_loop * sizeof(struct loop_device), GFP_KERNEL);
+	loop_dev = kzalloc(max_loop * sizeof(struct loop_device), GFP_KERNEL);
 	if (!loop_dev)
 		goto out_mem1;
-	memset(loop_dev, 0, max_loop * sizeof(struct loop_device));
 
 	disks = kmalloc(max_loop * sizeof(struct gendisk *), GFP_KERNEL);
 	if (!disks)

@@ -1271,7 +1270,6 @@ static int __init loop_init(void)
 		struct loop_device *lo = &loop_dev[i];
 		struct gendisk *disk = disks[i];
 
-		memset(lo, 0, sizeof(*lo));
 		lo->lo_queue = blk_alloc_queue(GFP_KERNEL);
 		if (!lo->lo_queue)
 			goto out_mem4;
drivers/block/paride/bpck6.c +1 -2
@@ -224,10 +224,9 @@ static void bpck6_log_adapter( PIA *pi, 
 
 static int bpck6_init_proto(PIA *pi)
 {
-	Interface *p = kmalloc(sizeof(Interface), GFP_KERNEL);
+	Interface *p = kzalloc(sizeof(Interface), GFP_KERNEL);
 
 	if (p) {
-		memset(p, 0, sizeof(Interface));
 		pi->private = (unsigned long)p;
 		return 0;
 	}
drivers/block/scsi_ioctl.c +1 -3
@@ -366,11 +366,9 @@ static int sg_scsi_ioctl(struct file *fi
 
 	bytes = max(in_len, out_len);
 	if (bytes) {
-		buffer = kmalloc(bytes, q->bounce_gfp | GFP_USER| __GFP_NOWARN);
+		buffer = kzalloc(bytes, q->bounce_gfp | GFP_USER| __GFP_NOWARN);
 		if (!buffer)
 			return -ENOMEM;
-
-		memset(buffer, 0, bytes);
 	}
 
 	rq = blk_get_request(q, in_len ? WRITE : READ, __GFP_WAIT);
drivers/block/sx8.c +1 -2
@@ -1605,7 +1605,7 @@ static int carm_init_one (struct pci_dev
 	}
 #endif
 
-	host = kmalloc(sizeof(*host), GFP_KERNEL);
+	host = kzalloc(sizeof(*host), GFP_KERNEL);
 	if (!host) {
 		printk(KERN_ERR DRV_NAME "(%s): memory alloc failure\n",
 		       pci_name(pdev));

@@ -1613,7 +1613,6 @@ static int carm_init_one (struct pci_dev
 		goto err_out_regions;
 	}
 
-	memset(host, 0, sizeof(*host));
 	host->pdev = pdev;
 	host->flags = pci_dac ? FL_DAC : 0;
 	spin_lock_init(&host->lock);
drivers/block/ub.c +4 -8
@@ -1824,9 +1824,8 @@ static int ub_sync_tur(struct ub_dev *sc
 	init_completion(&compl);
 
 	rc = -ENOMEM;
-	if ((cmd = kmalloc(ALLOC_SIZE, GFP_KERNEL)) == NULL)
+	if ((cmd = kzalloc(ALLOC_SIZE, GFP_KERNEL)) == NULL)
 		goto err_alloc;
-	memset(cmd, 0, ALLOC_SIZE);
 
 	cmd->cdb[0] = TEST_UNIT_READY;
 	cmd->cdb_len = 6;

@@ -1879,9 +1878,8 @@ static int ub_sync_read_cap(struct ub_de
 	init_completion(&compl);
 
 	rc = -ENOMEM;
-	if ((cmd = kmalloc(ALLOC_SIZE, GFP_KERNEL)) == NULL)
+	if ((cmd = kzalloc(ALLOC_SIZE, GFP_KERNEL)) == NULL)
 		goto err_alloc;
-	memset(cmd, 0, ALLOC_SIZE);
 	p = (char *)cmd + sizeof(struct ub_scsi_cmd);
 
 	cmd->cdb[0] = 0x25;

@@ -2173,9 +2171,8 @@ static int ub_probe(struct usb_interface
 	int i;
 
 	rc = -ENOMEM;
-	if ((sc = kmalloc(sizeof(struct ub_dev), GFP_KERNEL)) == NULL)
+	if ((sc = kzalloc(sizeof(struct ub_dev), GFP_KERNEL)) == NULL)
 		goto err_core;
-	memset(sc, 0, sizeof(struct ub_dev));
 	spin_lock_init(&sc->lock);
 	INIT_LIST_HEAD(&sc->luns);
 	usb_init_urb(&sc->work_urb);

@@ -2288,9 +2285,8 @@ static int ub_probe_lun(struct ub_dev *s
 	int rc;
 
 	rc = -ENOMEM;
-	if ((lun = kmalloc(sizeof(struct ub_lun), GFP_KERNEL)) == NULL)
+	if ((lun = kzalloc(sizeof(struct ub_lun), GFP_KERNEL)) == NULL)
 		goto err_alloc;
-	memset(lun, 0, sizeof(struct ub_lun));
 	lun->num = lnum;
 
 	rc = -ENOSR;
Signature · 3 lines
Deepak Saxena - [email protected] - http://www.plexity.net

Even a stopped clock gives the right time twice a day.
#2 lore raw
In reply to Deepak Saxena
Quoted 1 line · Deepak Saxena

Confused. This patch changes lots of block code, not bluetooth.

drivers/block/DAC960.c static void DAC960_V2_ProcessCompletedCo

Quoted 12 lines
drivers/block/DAC960.c +0 -1
@@ -4665,7 +4663,6 @@ static void DAC960_V2_ProcessCompletedCo
 	   */
 	   DAC960_queue_partial_rw(Command);
 	   return;
-	}
       else
 	{
 	  if (Command->V2.RequestSense->SenseKey != DAC960_SenseKey_NotReady)

@@ -4799,10 +4796,10 @@ static void DAC960_V2_ProcessCompletedCo

And that looks rather wrong.

maintainer
#3 lore raw

Hi Andrew,

Quoted 1 line

Confused. This patch changes lots of block code, not bluetooth.

I know. This is what I already mailed Deepak, but he never replied.

Regards

Marcel

author
#4 lore raw

On Oct 12 2005, at 00:52, Marcel Holtmann was caught saying:

Quoted 5 lines

Hi Andrew,

Quoted 1 line

Confused. This patch changes lots of block code, not bluetooth.

I know. This is what I already mailed Deepak, but he never replied.

Sorry, got lost in the mailbox. I think I was not paying attention to my tab completion and included the wrong patch. Proper patch follows.

~Deepak

Signed-off-by Deepak Saxena <[email protected]>
drivers/bluetooth/bcm203x.c +1 -3
@@ -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;
drivers/bluetooth/bfusb.c +1 -3
@@ -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;
drivers/bluetooth/bluecard_cs.c +1 -2
@@ -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;
drivers/bluetooth/bpa10x.c +1 -3
@@ -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);
drivers/bluetooth/bt3c_cs.c +1 -2
@@ -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;
drivers/bluetooth/btuart_cs.c +1 -2
@@ -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;
drivers/bluetooth/dtl1_cs.c +1 -2
@@ -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;
drivers/bluetooth/hci_bcsp.c +1 -2
@@ -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);
drivers/bluetooth/hci_h4.c +1 -2
@@ -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);
drivers/bluetooth/hci_ldisc.c +1 -2
@@ -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;
drivers/bluetooth/hci_usb.c +2 -5
@@ -134,10 +134,9 @@ static struct usb_device_id blacklist_id
 
 static struct _urb *_urb_alloc(int isoc, unsigned int __nocast gfp)
 {
-	struct _urb *_urb = kmalloc(sizeof(struct _urb) +
+	struct _urb *_urb = kzalloc(sizeof(struct _urb) +
 				sizeof(struct usb_iso_packet_descriptor) * isoc, gfp);
 	if (_urb) {
-		memset(_urb, 0, sizeof(*_urb));
 		usb_init_urb(&_urb->urb);
 	}
 	return _urb;

@@ -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;
drivers/bluetooth/hci_vhci.c +1 -3
@@ -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);
Signature · 3 lines
Deepak Saxena - [email protected] - http://www.plexity.net

Even a stopped clock gives the right time twice a day.
#5 lore raw
Quoted 11 lines · Deepak Saxena

On Oct 12 2005, at 00:52, Marcel Holtmann was caught saying:

Quoted 5 lines

Hi Andrew,

Quoted 1 line

Confused. This patch changes lots of block code, not bluetooth.

I know. This is what I already mailed Deepak, but he never replied.

Sorry, got lost in the mailbox. I think I was not paying attention to my tab completion and included the wrong patch. Proper patch follows.

[...]

Quoted 4 lines
drivers/bluetooth/hci_usb.c +0 -0
@@ -134,10 +134,9 @@ static struct usb_device_id blacklist_id

drivers/bluetooth/hci_usb.c static struct usb_device_id blacklist_id · line 142

Quoted 10 lines
drivers/bluetooth/hci_usb.c +1 -2
 static struct _urb *_urb_alloc(int isoc, unsigned int __nocast gfp)
 {
-	struct _urb *_urb = kmalloc(sizeof(struct _urb) +
+	struct _urb *_urb = kzalloc(sizeof(struct _urb) +
 				sizeof(struct usb_iso_packet_descriptor) * isoc, gfp);
 	if (_urb) {
-		memset(_urb, 0, sizeof(*_urb));
 		usb_init_urb(&_urb->urb);
 	}
 	return _urb;

This one doesn't keep the exact same behavior as before, as it is zeroing more memory than it did.

If this is not a performance critical path, then I guess it's ok (code size reduction, and all).

I just wanted to call some attention on this so that someone more knowledgeable than me in the bluetooth ways can make sure it's ok.

Signature · 5 lines
Paulo Marques - www.grupopie.com

The rule is perfect: in all matters of opinion our
adversaries are insane.
Mark Twain
maintainer
#6 lore raw

Hi Paulo,

Quoted 26 lines
Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Confused. This patch changes lots of block code, not bluetooth.

I know. This is what I already mailed Deepak, but he never replied.

Sorry, got lost in the mailbox. I think I was not paying attention to my tab completion and included the wrong patch. Proper patch follows.

[...]

Quoted 4 lines
drivers/bluetooth/hci_usb.c +0 -0
@@ -134,10 +134,9 @@ static struct usb_device_id blacklist_id

drivers/bluetooth/hci_usb.c static struct usb_device_id blacklist_id · line 142

Quoted 10 lines
drivers/bluetooth/hci_usb.c +1 -2
 static struct _urb *_urb_alloc(int isoc, unsigned int __nocast gfp)
 {
-	struct _urb *_urb = kmalloc(sizeof(struct _urb) +
+	struct _urb *_urb = kzalloc(sizeof(struct _urb) +
 				sizeof(struct usb_iso_packet_descriptor) * isoc, gfp);
 	if (_urb) {
-		memset(_urb, 0, sizeof(*_urb));
 		usb_init_urb(&_urb->urb);
 	}
 	return _urb;

This one doesn't keep the exact same behavior as before, as it is zeroing more memory than it did.

Quoted 5 lines

If this is not a performance critical path, then I guess it's ok (code size reduction, and all).

I just wanted to call some attention on this so that someone more knowledgeable than me in the bluetooth ways can make sure it's ok.

the current hci_usb URB shim layer is crap anyhow. We need to replace it at some point with better code, but so far I haven't had the time to do this properly.

Regards

Marcel