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

Commit 3b716933 authored by Kamenee Arumugam's avatar Kamenee Arumugam Committed by Doug Ledford
Browse files

IB/qib: Remove unnecessary memory allocation for boardname 



Remove all the memory allocation implemented for boardname and
directly assign the defined string literal.

Reviewed-by: default avatarMichael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: default avatarKamenee Arumugam <kamenee.arumugam@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 5b0ef650

drivers/infiniband/hw/qib/qib_iba6120.c

+7 −13
Original line number Diff line number Diff line
@@ -1742,25 +1742,20 @@ static void qib_setup_6120_interrupt(struct qib_devdata *dd) 
 */

static void pe_boardname(struct qib_devdata *dd)

{

	char *n;

	u32 boardid, namelen;

	u32 boardid;



	boardid = SYM_FIELD(dd->revision, Revision,

			    BoardID);



	switch (boardid) {

	case 2:

		n = "InfiniPath_QLE7140";

		dd->boardname = "InfiniPath_QLE7140";

		break;

	default:

		qib_dev_err(dd, "Unknown 6120 board with ID %u\n", boardid);

		n = "Unknown_InfiniPath_6120";

		dd->boardname = "Unknown_InfiniPath_6120";

		break;

	}

	namelen = strlen(n) + 1;

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

	if (dd->boardname)

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



	if (dd->majrev != 4 || !dd->minrev || dd->minrev > 2)

		qib_dev_err(dd,
@@ -1770,10 +1765,9 @@ static void pe_boardname(struct qib_devdata *dd) 
	snprintf(dd->boardversion, sizeof(dd->boardversion),

		 "ChipABI %u.%u, %s, InfiniPath%u %u.%u, SW Compat %u\n",

		 QIB_CHIP_VERS_MAJ, QIB_CHIP_VERS_MIN, dd->boardname,

		 (unsigned)SYM_FIELD(dd->revision, Revision_R, Arch),

		 (unsigned int)SYM_FIELD(dd->revision, Revision_R, Arch),

		 dd->majrev, dd->minrev,

		 (unsigned)SYM_FIELD(dd->revision, Revision_R, SW));



		 (unsigned int)SYM_FIELD(dd->revision, Revision_R, SW));

}



/*

drivers/infiniband/hw/qib/qib_iba7220.c

+8 −14
Original line number Diff line number Diff line
@@ -2050,30 +2050,24 @@ static void qib_setup_7220_interrupt(struct qib_devdata *dd) 
 */

static void qib_7220_boardname(struct qib_devdata *dd)

{

	char *n;

	u32 boardid, namelen;

	u32 boardid;



	boardid = SYM_FIELD(dd->revision, Revision,

			    BoardID);



	switch (boardid) {

	case 1:

		n = "InfiniPath_QLE7240";

		dd->boardname = "InfiniPath_QLE7240";

		break;

	case 2:

		n = "InfiniPath_QLE7280";

		dd->boardname = "InfiniPath_QLE7280";

		break;

	default:

		qib_dev_err(dd, "Unknown 7220 board with ID %u\n", boardid);

		n = "Unknown_InfiniPath_7220";

		dd->boardname = "Unknown_InfiniPath_7220";

		break;

	}



	namelen = strlen(n) + 1;

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

	if (dd->boardname)

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



	if (dd->majrev != 5 || !dd->minrev || dd->minrev > 2)

		qib_dev_err(dd,

			    "Unsupported InfiniPath hardware revision %u.%u!\n",
@@ -2082,9 +2076,9 @@ static void qib_7220_boardname(struct qib_devdata *dd) 
	snprintf(dd->boardversion, sizeof(dd->boardversion),

		 "ChipABI %u.%u, %s, InfiniPath%u %u.%u, SW Compat %u\n",

		 QIB_CHIP_VERS_MAJ, QIB_CHIP_VERS_MIN, dd->boardname,

		 (unsigned)SYM_FIELD(dd->revision, Revision_R, Arch),

		 (unsigned int)SYM_FIELD(dd->revision, Revision_R, Arch),

		 dd->majrev, dd->minrev,

		 (unsigned)SYM_FIELD(dd->revision, Revision_R, SW));

		 (unsigned int)SYM_FIELD(dd->revision, Revision_R, SW));

}



/*

drivers/infiniband/hw/qib/qib_iba7322.c

+17 −23
Original line number Diff line number Diff line
@@ -3582,70 +3582,64 @@ bail:; 
static unsigned qib_7322_boardname(struct qib_devdata *dd)

{

	/* Will need enumeration of board-types here */

	char *n;

	u32 boardid, namelen;

	unsigned features = DUAL_PORT_CAP;

	u32 boardid;

	unsigned int features = DUAL_PORT_CAP;



	boardid = SYM_FIELD(dd->revision, Revision, BoardID);



	switch (boardid) {

	case 0:

		n = "InfiniPath_QLE7342_Emulation";

		dd->boardname = "InfiniPath_QLE7342_Emulation";

		break;

	case 1:

		n = "InfiniPath_QLE7340";

		dd->boardname = "InfiniPath_QLE7340";

		dd->flags |= QIB_HAS_QSFP;

		features = PORT_SPD_CAP;

		break;

	case 2:

		n = "InfiniPath_QLE7342";

		dd->boardname = "InfiniPath_QLE7342";

		dd->flags |= QIB_HAS_QSFP;

		break;

	case 3:

		n = "InfiniPath_QMI7342";

		dd->boardname = "InfiniPath_QMI7342";

		break;

	case 4:

		n = "InfiniPath_Unsupported7342";

		dd->boardname = "InfiniPath_Unsupported7342";

		qib_dev_err(dd, "Unsupported version of QMH7342\n");

		features = 0;

		break;

	case BOARD_QMH7342:

		n = "InfiniPath_QMH7342";

		dd->boardname = "InfiniPath_QMH7342";

		features = 0x24;

		break;

	case BOARD_QME7342:

		n = "InfiniPath_QME7342";

		dd->boardname = "InfiniPath_QME7342";

		break;

	case 8:

		n = "InfiniPath_QME7362";

		dd->boardname = "InfiniPath_QME7362";

		dd->flags |= QIB_HAS_QSFP;

		break;

	case BOARD_QMH7360:

		n = "Intel IB QDR 1P FLR-QSFP Adptr";

		dd->boardname = "Intel IB QDR 1P FLR-QSFP Adptr";

		dd->flags |= QIB_HAS_QSFP;

		break;

	case 15:

		n = "InfiniPath_QLE7342_TEST";

		dd->boardname = "InfiniPath_QLE7342_TEST";

		dd->flags |= QIB_HAS_QSFP;

		break;

	default:

		n = "InfiniPath_QLE73xy_UNKNOWN";

		dd->boardname = "InfiniPath_QLE73xy_UNKNOWN";

		qib_dev_err(dd, "Unknown 7322 board type %u\n", boardid);

		break;

	}

	dd->board_atten = 1; /* index into txdds_Xdr */



	namelen = strlen(n) + 1;

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

	if (dd->boardname)

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



	snprintf(dd->boardversion, sizeof(dd->boardversion),

		 "ChipABI %u.%u, %s, InfiniPath%u %u.%u, SW Compat %u\n",

		 QIB_CHIP_VERS_MAJ, QIB_CHIP_VERS_MIN, dd->boardname,

		 (unsigned)SYM_FIELD(dd->revision, Revision_R, Arch),

		 (unsigned int)SYM_FIELD(dd->revision, Revision_R, Arch),

		 dd->majrev, dd->minrev,

		 (unsigned)SYM_FIELD(dd->revision, Revision_R, SW));

		 (unsigned int)SYM_FIELD(dd->revision, Revision_R, SW));



	if (qib_singleport && (features >> PORT_SPD_CAP_SHIFT) & PORT_SPD_CAP) {

		qib_devinfo(dd->pcidev,

drivers/infiniband/hw/qib/qib_init.c

+0 −1
Original line number Diff line number Diff line
@@ -1398,7 +1398,6 @@ static void cleanup_device_data(struct qib_devdata *dd) 
		qib_free_ctxtdata(dd, rcd);

	}

	kfree(tmp);

	kfree(dd->boardname);

}



/*