OSDN Git Service

scsi: qla2xxx: don't include <generated/utsrelease.h>
authorJohannes Berg <johannes.berg@intel.com>
Wed, 21 Jun 2017 11:40:05 +0000 (13:40 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Mon, 26 Jun 2017 19:00:59 +0000 (15:00 -0400)
There's no need to use the static UTS_RELEASE string, since
utsname()->release contains the same.

This avoids rebuilding this file for every change of the release string.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/qla2xxx/tcm_qla2xxx.c

index 238abad..00ae1f4 100644 (file)
@@ -25,7 +25,6 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <generated/utsrelease.h>
 #include <linux/utsname.h>
 #include <linux/vmalloc.h>
 #include <linux/init.h>
@@ -1883,9 +1882,9 @@ static ssize_t tcm_qla2xxx_wwn_version_show(struct config_item *item,
                char *page)
 {
        return sprintf(page,
-           "TCM QLOGIC QLA2XXX NPIV capable fabric module %s on %s/%s on "
-           UTS_RELEASE"\n", QLA2XXX_VERSION, utsname()->sysname,
-           utsname()->machine);
+           "TCM QLOGIC QLA2XXX NPIV capable fabric module %s on %s/%s on %s\n",
+           QLA2XXX_VERSION, utsname()->sysname,
+           utsname()->machine, utsname()->release);
 }
 
 CONFIGFS_ATTR_RO(tcm_qla2xxx_wwn_, version);
@@ -1989,9 +1988,9 @@ static int tcm_qla2xxx_register_configfs(void)
 {
        int ret;
 
-       pr_debug("TCM QLOGIC QLA2XXX fabric module %s on %s/%s on "
-           UTS_RELEASE"\n", QLA2XXX_VERSION, utsname()->sysname,
-           utsname()->machine);
+       pr_debug("TCM QLOGIC QLA2XXX fabric module %s on %s/%s on %s\n",
+           QLA2XXX_VERSION, utsname()->sysname,
+           utsname()->machine, utsname()->release);
 
        ret = target_register_template(&tcm_qla2xxx_ops);
        if (ret)