On Wed, Jun 25, 2014 at 11:48:23AM -0500, Ken Cox wrote:
> 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 <[email protected]>
> Signed-off-by: Ken Cox <[email protected]>
> ---
> 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);
Why not change the function to not need these last 2 values at all?
>
> 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,
Just remove these fields entirely, why set them to NULL, they aren't
needed at all.
> .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);
Why not just delete this proc file entirely? You'll have to do that
eventually anyway :)
thanks,
greg k-h
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
