On Fri, Dec 05, 2014 at 05:09:28PM -0500, Benjamin Romer wrote:
> Remove the entire set of LOGINFO() macros and replace them with calls to
> pr_info() instead.
>
> Signed-off-by: Ken Depro <kenneth.depro@xxxxxxxxxx>
> Signed-off-by: Benjamin Romer <benjamin.romer@xxxxxxxxxx>
> ---
> drivers/staging/unisys/include/timskmod.h | 5 --
> drivers/staging/unisys/include/uniklog.h | 29 --------
> drivers/staging/unisys/uislib/uislib.c | 40 +++++-----
> drivers/staging/unisys/uislib/uisthread.c | 6 +-
> drivers/staging/unisys/uislib/uisutils.c | 6 +-
> drivers/staging/unisys/virthba/virthba.c | 54 +++++++-------
> drivers/staging/unisys/virtpci/virtpci.c | 72 +++++++++---------
> .../unisys/visorchannel/visorchannel_main.c | 4 +-
> drivers/staging/unisys/visorchipset/file.c | 6 +-
> .../unisys/visorchipset/visorchipset_main.c | 86 +++++++++++-----------
> 10 files changed, 137 insertions(+), 171 deletions(-)
>
> diff --git a/drivers/staging/unisys/include/timskmod.h b/drivers/staging/unisys/include/timskmod.h
> index 3d563c4..5f33d5c 100644
> --- a/drivers/staging/unisys/include/timskmod.h
> +++ b/drivers/staging/unisys/include/timskmod.h
> @@ -87,16 +87,11 @@
> (void *)(p2) = SWAPPOINTERS_TEMP; \
> } while (0)
>
> -#define PRINTKDRV(fmt, args...) LOGINF(fmt, ## args)
> #define WARNDRV(fmt, args...) LOGWRN(fmt, ## args)
> #define SECUREDRV(fmt, args...) LOGWRN(fmt, ## args)
> -#define INFODRV(fmt, args...) LOGINF(fmt, ## args)
>
> -#define PRINTKDEV(devname, fmt, args...) LOGINFDEV(devname, fmt, ## args)
> #define WARNDEV(devname, fmt, args...) LOGWRNDEV(devname, fmt, ## args)
> #define SECUREDEV(devname, fmt, args...) LOGWRNDEV(devname, fmt, ## args)
> -#define INFODEV(devname, fmt, args...) LOGINFDEV(devname, fmt, ## args)
> -#define INFODEVX(devno, fmt, args...) LOGINFDEVX(devno, fmt, ## args)
>
> /** Verifies the consistency of your PRIVATEDEVICEDATA structure using
> * conventional "signature" fields:
> diff --git a/drivers/staging/unisys/include/uniklog.h b/drivers/staging/unisys/include/uniklog.h
> index edc12f0..74a723e 100644
> --- a/drivers/staging/unisys/include/uniklog.h
> +++ b/drivers/staging/unisys/include/uniklog.h
> @@ -26,35 +26,6 @@
> #include <linux/printk.h>
>
> /*
> - * # LOGINF
> - *
> - * \brief Log informational message - logs a message at the LOG_INFO level
> - *
> - * \param devname the device name of the device reporting this message, or
> - * NULL if this message is NOT device-related.
> - * \param fmt printf()-style format string containing the message to log.
> - * \param args Optional arguments to be formatted and inserted into the
> - * format string.
> - * \return nothing
> - *
> - * Logs the specified message at the LOG_INFO level.
> - */
> -
> -#define LOGINF(fmt, args...) pr_info(fmt, ## args)
> -#define LOGINFDEV(devname, fmt, args...) \
> - pr_info("%s " fmt, devname, ## args)
> -#define LOGINFDEVX(devno, fmt, args...) \
> - pr_info("dev%d " fmt, devno, ## args)
> -#define LOGINFNAME(vnic, fmt, args...) \
> - do { \
> - if (vnic != NULL) { \
> - pr_info("%s " fmt, vnic->name, ## args); \
> - } else { \
> - pr_info(fmt, ## args); \
> - } \
> - } while (0)
> -
> -/*
> * # LOGVER
> *
> * \brief Log verbose message - logs a message at the LOG_DEBUG level,
> diff --git a/drivers/staging/unisys/uislib/uislib.c b/drivers/staging/unisys/uislib/uislib.c
> index d986fde..b6a7fb0 100644
> --- a/drivers/staging/unisys/uislib/uislib.c
> +++ b/drivers/staging/unisys/uislib/uislib.c
> @@ -671,7 +671,7 @@ static int destroy_device(struct controlvm_message *msg, char *buf)
> dev_no = msg->cmd.destroy_device.bus_no;
>
> read_lock(&bus_list_lock);
> - LOGINF("destroy_device called for bus_no=%u, dev_no=%u", bus_no,
> + pr_info("destroy_device called for bus_no=%u, dev_no=%u", bus_no,
> dev_no);
> for (bus = bus_list; bus; bus = bus->next) {
> if (bus->bus_no == bus_no) {
> @@ -733,12 +733,12 @@ static int destroy_device(struct controlvm_message *msg, char *buf)
> * kernel paging request"
> */
> if (dev->polling) {
> - LOGINF("calling uislib_disable_channel_interrupts");
> + pr_info("calling uislib_disable_channel_interrupts");
> uislib_disable_channel_interrupts(bus_no, dev_no);
> }
> /* unmap the channel memory for the device. */
> if (!msg->hdr.flags.test_message) {
> - LOGINF("destroy_device, doing iounmap");
> + pr_info("destroy_device, doing iounmap");
> uislib_iounmap(dev->chanptr);
> }
> kfree(dev);
> @@ -806,7 +806,7 @@ uislib_client_inject_add_bus(u32 bus_no, uuid_le inst_uuid,
> {
> struct controlvm_message msg;
>
> - LOGINF("enter busNo=0x%x\n", bus_no);
> + pr_info("enter busNo=0x%x\n", bus_no);
I never want to see a working subsystem or driver make any messages in
the kernel log, unless it's actually something that a user needs to
know.
> /* step 0: init the chipset */
> POSTCODE_LINUX_3(CHIPSET_INIT_ENTRY_PC, bus_no, POSTCODE_SEVERITY_INFO);
>
> @@ -826,7 +826,7 @@ uislib_client_inject_add_bus(u32 bus_no, uuid_le inst_uuid,
> pr_err("init_chipset failed.\n");
> return 0;
> }
> - LOGINF("chipset initialized\n");
> + pr_info("chipset initialized\n");
That's not anything anyone cares about, rigth?
Please remove almost all of these, they look like debugging messages, so
if you really want them around, make them debug messages that can be
turned on dynamically if needed.
thanks,
greg k-h
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
