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

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

enic: use pci_zalloc_consistent 



Remove the now unnecessary memset too.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Cc: Christian Benvenuti <benve@cisco.com>
Cc: Sujith Sankar <ssujith@cisco.com>
Cc: Govindarajulu Varadarajan <_govind@gmx.com>
Cc: Neel Patel <neepatel@cisco.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 19118268

drivers/net/ethernet/cisco/enic/vnic_dev.c

+3 −5
Original line number Diff line number Diff line
@@ -432,14 +432,12 @@ int vnic_dev_fw_info(struct vnic_dev *vdev, 
	int err = 0;



	if (!vdev->fw_info) {

		vdev->fw_info = pci_alloc_consistent(vdev->pdev,

		vdev->fw_info = pci_zalloc_consistent(vdev->pdev,

						      sizeof(struct vnic_devcmd_fw_info),

						      &vdev->fw_info_pa);

		if (!vdev->fw_info)

			return -ENOMEM;



		memset(vdev->fw_info, 0, sizeof(struct vnic_devcmd_fw_info));



		a0 = vdev->fw_info_pa;

		a1 = sizeof(struct vnic_devcmd_fw_info);