The use of __DATE__ and __TIME__ is no longer allowed in the kernel so this
commit removes those. They were once useful when the drivers were being
built externally, but now that the drivers are in the kernel the use of the
macros is redundant since the kernel already has the same information
elsewhere.
In addition, using these macros breaks the build if using gcc 4.9.0
Reported-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ken Cox <jkc@xxxxxxxxxx>
---
drivers/staging/unisys/uislib/uisutils.c | 8 +++-----
drivers/staging/unisys/virthba/virthba.c | 7 ++-----
drivers/staging/unisys/virtpci/virtpci.c | 11 ++---------
drivers/staging/unisys/visorchipset/visorchipset_main.c | 4 ++--
4 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/drivers/staging/unisys/uislib/uisutils.c b/drivers/staging/unisys/uislib/uisutils.c
index 0f1bb73..6c58637 100644
--- a/drivers/staging/unisys/uislib/uisutils.c
+++ b/drivers/staging/unisys/uislib/uisutils.c
@@ -96,9 +96,8 @@ uisctrl_register_req_handler(int type, void *fptr,
return 0;
}
if (chipset_DriverInfo)
- BusDeviceInfo_Init(chipset_DriverInfo,
- "chipset", "uislib",
- VERSION, NULL, __DATE__, __TIME__);
+ BusDeviceInfo_Init(chipset_DriverInfo, "chipset", "uislib",
+ VERSION, NULL, NULL, NULL);
return 1;
}
@@ -151,8 +150,7 @@ Away:
if (chipset_DriverInfo)
BusDeviceInfo_Init(chipset_DriverInfo,
"chipset", "uislib",
- VERSION, NULL,
- __DATE__, __TIME__);
+ VERSION, NULL, NULL, NULL);
} else
LOGERR("failed to register type %pUL.\n", &switchTypeGuid);
diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c
index 5c5aa70..e58f3b8 100644
--- a/drivers/staging/unisys/virthba/virthba.c
+++ b/drivers/staging/unisys/virthba/virthba.c
@@ -139,8 +139,8 @@ static struct virtpci_driver virthba_driver = {
.name = "uisvirthba",
.version = VERSION,
.vertag = NULL,
- .build_date = __DATE__,
- .build_time = __TIME__,
+ .build_date = NULL,
+ .build_time = NULL,
.id_table = virthba_id_table,
.probe = virthba_probe,
.remove = virthba_remove,
@@ -1413,9 +1413,6 @@ info_proc_read(struct file *file, char __user *buf, size_t len, loff_t *offset)
length += sprintf(vbuf + length, "\nvirthba result queue poll wait:%d usecs.\n",
rsltq_wait_usecs);
- length += sprintf(vbuf + length,
- "\nModule build: Date:%s Time:%s\n",
- __DATE__, __TIME__);
length += sprintf(vbuf + length, "\ninterrupts_rcvd = %llu, interrupts_disabled = %llu\n",
virthbainfo->interrupts_rcvd,
virthbainfo->interrupts_disabled);
diff --git a/drivers/staging/unisys/virtpci/virtpci.c b/drivers/staging/unisys/virtpci/virtpci.c
index 71246fe..35df6cd 100644
--- a/drivers/staging/unisys/virtpci/virtpci.c
+++ b/drivers/staging/unisys/virtpci/virtpci.c
@@ -1480,10 +1480,6 @@ static ssize_t info_proc_read(struct file *file, char __user *buf,
}
read_unlock_irqrestore(&VpcidevListLock, flags);
- length +=
- sprintf(vbuf + length, "\nModule build: Date:%s Time:%s\n", __DATE__,
- __TIME__);
-
length += sprintf(vbuf + length, "\n");
if (copy_to_user(buf, vbuf, length)) {
kfree(vbuf);
@@ -1686,8 +1682,6 @@ static int __init virtpci_mod_init(void)
if (!unisys_spar_platform)
return -ENODEV;
- LOGINF("Module build: Date:%s Time:%s...\n", __DATE__, __TIME__);
-
POSTCODE_LINUX_2(VPCI_CREATE_ENTRY_PC, POSTCODE_SEVERITY_INFO);
ret = bus_register(&virtpci_bus_type);
@@ -1701,9 +1695,8 @@ static int __init virtpci_mod_init(void)
return ret;
}
DBGINF("bus_register successful\n");
- BusDeviceInfo_Init(&Bus_DriverInfo,
- "clientbus", "virtpci",
- VERSION, NULL, __DATE__, __TIME__);
+ BusDeviceInfo_Init(&Bus_DriverInfo, "clientbus", "virtpci",
+ VERSION, NULL, NULL, NULL);
/* create a root bus used to parent all the virtpci buses. */
ret = device_register(&virtpci_rootbus_device);
diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c
index 0a602b9..689e7d1 100644
--- a/drivers/staging/unisys/visorchipset/visorchipset_main.c
+++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c
@@ -569,7 +569,7 @@ visorchipset_register_busdev_server(VISORCHIPSET_BUSDEV_NOTIFIERS *notifiers,
*responders = BusDev_Responders;
if (driverInfo)
BusDeviceInfo_Init(driverInfo, "chipset", "visorchipset",
- VERSION, NULL, __DATE__, __TIME__);
+ VERSION, NULL, NULL, NULL);
UNLOCKSEM(&NotifierLock);
}
@@ -593,7 +593,7 @@ visorchipset_register_busdev_client(VISORCHIPSET_BUSDEV_NOTIFIERS *notifiers,
*responders = BusDev_Responders;
if (driverInfo)
BusDeviceInfo_Init(driverInfo, "chipset(bolts)", "visorchipset",
- VERSION, NULL, __DATE__, __TIME__);
+ VERSION, NULL, NULL, NULL);
UNLOCKSEM(&NotifierLock);
}
EXPORT_SYMBOL_GPL(visorchipset_register_busdev_client);
--
1.9.3
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
