Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0b6539c authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

ipw2100: use pci_zalloc_consistent 



Remove the now unnecessary memset too.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Stanislav Yakovlev <stas.yakovlev@gmail.com>
Cc: "John W. Linville" <linville@tuxdriver.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 38537b7f

drivers/net/wireless/ipw2x00/ipw2100.c

+5 −11
Original line number Diff line number Diff line
@@ -3449,8 +3449,9 @@ static int ipw2100_msg_allocate(struct ipw2100_priv *priv) 
		return -ENOMEM;



	for (i = 0; i < IPW_COMMAND_POOL_SIZE; i++) {

		v = pci_alloc_consistent(priv->pci_dev,

					 sizeof(struct ipw2100_cmd_header), &p);

		v = pci_zalloc_consistent(priv->pci_dev,

					  sizeof(struct ipw2100_cmd_header),

					  &p);

		if (!v) {

			printk(KERN_ERR DRV_NAME ": "

			       "%s: PCI alloc failed for msg "
@@ -3459,8 +3460,6 @@ static int ipw2100_msg_allocate(struct ipw2100_priv *priv) 
			break;

		}



		memset(v, 0, sizeof(struct ipw2100_cmd_header));



		priv->msg_buffers[i].type = COMMAND;

		priv->msg_buffers[i].info.c_struct.cmd =

		    (struct ipw2100_cmd_header *)v;
@@ -4336,16 +4335,12 @@ static int status_queue_allocate(struct ipw2100_priv *priv, int entries) 
	IPW_DEBUG_INFO("enter\n");



	q->size = entries * sizeof(struct ipw2100_status);

	q->drv =

	    (struct ipw2100_status *)pci_alloc_consistent(priv->pci_dev,

							  q->size, &q->nic);

	q->drv = pci_zalloc_consistent(priv->pci_dev, q->size, &q->nic);

	if (!q->drv) {

		IPW_DEBUG_WARNING("Can not allocate status queue.\n");

		return -ENOMEM;

	}



	memset(q->drv, 0, q->size);



	IPW_DEBUG_INFO("exit\n");



	return 0;
@@ -4374,13 +4369,12 @@ static int bd_queue_allocate(struct ipw2100_priv *priv, 


	q->entries = entries;

	q->size = entries * sizeof(struct ipw2100_bd);

	q->drv = pci_alloc_consistent(priv->pci_dev, q->size, &q->nic);

	q->drv = pci_zalloc_consistent(priv->pci_dev, q->size, &q->nic);

	if (!q->drv) {

		IPW_DEBUG_INFO

		    ("can't allocate shared memory for buffer descriptors\n");

		return -ENOMEM;

	}

	memset(q->drv, 0, q->size);



	IPW_DEBUG_INFO("exit\n");