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: Michael J. Ruhl <michael.j.ruhl@intel.com> Signed-off-by: Kamenee Arumugam <kamenee.arumugam@intel.com> Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
このコミットが含まれているのは:
@@ -1742,38 +1742,32 @@ 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,
|
||||
"Unsupported InfiniPath hardware revision %u.%u!\n",
|
||||
dd->majrev, dd->minrev);
|
||||
"Unsupported InfiniPath hardware revision %u.%u!\n",
|
||||
dd->majrev, dd->minrev);
|
||||
|
||||
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));
|
||||
}
|
||||
|
||||
/*
|
||||
|
新しいイシューから参照
ユーザーをブロックする