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

Commit c40a83b9 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Doug Ledford
Browse files

IB/qib: Remove debug prints after allocation failure 



The prints after [k|v][m|z|c]alloc() functions are not needed,
because in case of failure, allocator will print their internal
error prints anyway.

Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 315b4148

drivers/infiniband/hw/qib/qib_diag.c

+1 −5
Original line number Diff line number Diff line
@@ -609,8 +609,6 @@ static ssize_t qib_diagpkt_write(struct file *fp, 


	tmpbuf = vmalloc(plen);

	if (!tmpbuf) {

		qib_devinfo(dd->pcidev,

			"Unable to allocate tmp buffer, failing\n");

		ret = -ENOMEM;

		goto bail;

	}
@@ -702,10 +700,8 @@ int qib_register_observer(struct qib_devdata *dd, 
	if (!dd || !op)

		return -EINVAL;

	olp = vmalloc(sizeof(*olp));

	if (!olp) {

		pr_err("vmalloc for observer failed\n");

	if (!olp)

		return -ENOMEM;

	}



	spin_lock_irqsave(&dd->qib_diag_trans_lock, flags);

	olp->op = op;

drivers/infiniband/hw/qib/qib_eeprom.c

+1 −5
Original line number Diff line number Diff line
@@ -182,12 +182,8 @@ void qib_get_eeprom_info(struct qib_devdata *dd) 
	 * */

	len = sizeof(struct qib_flash);

	buf = vmalloc(len);

	if (!buf) {

		qib_dev_err(dd,

			"Couldn't allocate memory to read %u bytes from eeprom for GUID\n",

			len);

	if (!buf)

		goto bail;

	}



	/*

	 * Use "public" eeprom read function, which does locking and

drivers/infiniband/hw/qib/qib_iba6120.c

+1 −7
Original line number Diff line number Diff line
@@ -1759,9 +1759,7 @@ static void pe_boardname(struct qib_devdata *dd) 
	}

	namelen = strlen(n) + 1;

	dd->boardname = kmalloc(namelen, GFP_KERNEL);

	if (!dd->boardname)

		qib_dev_err(dd, "Failed allocation for board name: %s\n", n);

	else

	if (dd->boardname)

		snprintf(dd->boardname, namelen, "%s", n);



	if (dd->majrev != 4 || !dd->minrev || dd->minrev > 2)
@@ -2533,8 +2531,6 @@ static void init_6120_cntrnames(struct qib_devdata *dd) 
		dd->cspec->cntrnamelen = 1 + s - cntr6120names;

	dd->cspec->cntrs = kmalloc(dd->cspec->ncntrs

		* sizeof(u64), GFP_KERNEL);

	if (!dd->cspec->cntrs)

		qib_dev_err(dd, "Failed allocation for counters\n");



	for (i = 0, s = (char *)portcntr6120names; s; i++)

		s = strchr(s + 1, '\n');
@@ -2542,8 +2538,6 @@ static void init_6120_cntrnames(struct qib_devdata *dd) 
	dd->cspec->portcntrnamelen = sizeof(portcntr6120names) - 1;

	dd->cspec->portcntrs = kmalloc(dd->cspec->nportcntrs

		* sizeof(u64), GFP_KERNEL);

	if (!dd->cspec->portcntrs)

		qib_dev_err(dd, "Failed allocation for portcounters\n");

}



static u32 qib_read_6120cntrs(struct qib_devdata *dd, loff_t pos, char **namep,

drivers/infiniband/hw/qib/qib_iba7220.c

+1 −7
Original line number Diff line number Diff line
@@ -2070,9 +2070,7 @@ static void qib_7220_boardname(struct qib_devdata *dd) 


	namelen = strlen(n) + 1;

	dd->boardname = kmalloc(namelen, GFP_KERNEL);

	if (!dd->boardname)

		qib_dev_err(dd, "Failed allocation for board name: %s\n", n);

	else

	if (dd->boardname)

		snprintf(dd->boardname, namelen, "%s", n);



	if (dd->majrev != 5 || !dd->minrev || dd->minrev > 2)
@@ -3179,8 +3177,6 @@ static void init_7220_cntrnames(struct qib_devdata *dd) 
		dd->cspec->cntrnamelen = 1 + s - cntr7220names;

	dd->cspec->cntrs = kmalloc(dd->cspec->ncntrs

		* sizeof(u64), GFP_KERNEL);

	if (!dd->cspec->cntrs)

		qib_dev_err(dd, "Failed allocation for counters\n");



	for (i = 0, s = (char *)portcntr7220names; s; i++)

		s = strchr(s + 1, '\n');
@@ -3188,8 +3184,6 @@ static void init_7220_cntrnames(struct qib_devdata *dd) 
	dd->cspec->portcntrnamelen = sizeof(portcntr7220names) - 1;

	dd->cspec->portcntrs = kmalloc(dd->cspec->nportcntrs

		* sizeof(u64), GFP_KERNEL);

	if (!dd->cspec->portcntrs)

		qib_dev_err(dd, "Failed allocation for portcounters\n");

}



static u32 qib_read_7220cntrs(struct qib_devdata *dd, loff_t pos, char **namep,

drivers/infiniband/hw/qib/qib_iba7322.c

+5 −17
Original line number Diff line number Diff line
@@ -3627,9 +3627,7 @@ static unsigned qib_7322_boardname(struct qib_devdata *dd) 


	namelen = strlen(n) + 1;

	dd->boardname = kmalloc(namelen, GFP_KERNEL);

	if (!dd->boardname)

		qib_dev_err(dd, "Failed allocation for board name: %s\n", n);

	else

	if (dd->boardname)

		snprintf(dd->boardname, namelen, "%s", n);



	snprintf(dd->boardversion, sizeof(dd->boardversion),
@@ -3656,7 +3654,7 @@ static unsigned qib_7322_boardname(struct qib_devdata *dd) 
static int qib_do_7322_reset(struct qib_devdata *dd)

{

	u64 val;

	u64 *msix_vecsave;

	u64 *msix_vecsave = NULL;

	int i, msix_entries, ret = 1;

	u16 cmdval;

	u8 int_line, clinesz;
@@ -3677,10 +3675,7 @@ static int qib_do_7322_reset(struct qib_devdata *dd) 
		/* can be up to 512 bytes, too big for stack */

		msix_vecsave = kmalloc(2 * dd->cspec->num_msix_entries *

			sizeof(u64), GFP_KERNEL);

		if (!msix_vecsave)

			qib_dev_err(dd, "No mem to save MSIx data\n");

	} else

		msix_vecsave = NULL;

	}



	/*

	 * Core PCI (as of 2.6.18) doesn't save or rewrite the full vector
@@ -5043,8 +5038,6 @@ static void init_7322_cntrnames(struct qib_devdata *dd) 
		dd->cspec->cntrnamelen = 1 + s - cntr7322names;

	dd->cspec->cntrs = kmalloc(dd->cspec->ncntrs

		* sizeof(u64), GFP_KERNEL);

	if (!dd->cspec->cntrs)

		qib_dev_err(dd, "Failed allocation for counters\n");



	for (i = 0, s = (char *)portcntr7322names; s; i++)

		s = strchr(s + 1, '\n');
@@ -5053,9 +5046,6 @@ static void init_7322_cntrnames(struct qib_devdata *dd) 
	for (i = 0; i < dd->num_pports; ++i) {

		dd->pport[i].cpspec->portcntrs = kmalloc(dd->cspec->nportcntrs

			* sizeof(u64), GFP_KERNEL);

		if (!dd->pport[i].cpspec->portcntrs)

			qib_dev_err(dd,

				"Failed allocation for portcounters\n");

	}

}
@@ -6461,7 +6451,6 @@ static int qib_init_7322_variables(struct qib_devdata *dd) 
		sizeof(*dd->cspec->sendibchk), GFP_KERNEL);

	if (!dd->cspec->sendchkenable || !dd->cspec->sendgrhchk ||

		!dd->cspec->sendibchk) {

		qib_dev_err(dd, "Failed allocation for hdrchk bitmaps\n");

		ret = -ENOMEM;

		goto bail;

	}
@@ -7338,10 +7327,9 @@ struct qib_devdata *qib_init_iba7322_funcs(struct pci_dev *pdev, 
	tabsize = actual_cnt;

	dd->cspec->msix_entries = kzalloc(tabsize *

			sizeof(struct qib_msix_entry), GFP_KERNEL);

	if (!dd->cspec->msix_entries) {

		qib_dev_err(dd, "No memory for MSIx table\n");

	if (!dd->cspec->msix_entries)

		tabsize = 0;

	}



	for (i = 0; i < tabsize; i++)

		dd->cspec->msix_entries[i].msix.entry = i;