Commit 2098dbd1 authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

staging: unisys: remove LOGINF macros 



Remove the LOGINF, LOGINFDEV, LOGINFDEVX, LOGINFNAME, PRINTKDRV, and
INFODRV macros entirely from the driver set.

Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4de57acb

drivers/staging/unisys/include/timskmod.h

+0 −2
Original line number Diff line number Diff line
@@ -87,13 +87,11 @@ 
		(void *)(p2) = SWAPPOINTERS_TEMP;	\

	} while (0)



#define PRINTKDRV(fmt, args...) LOGINF(fmt, ## args)

#define TBDDRV(fmt, args...)    LOGERR(fmt, ## args)

#define HUHDRV(fmt, args...)    LOGERR(fmt, ## args)

#define ERRDRV(fmt, args...)    LOGERR(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 TBDDEV(devname, fmt, args...)     LOGERRDEV(devname, fmt, ## args)

drivers/staging/unisys/include/uniklog.h

+0 −29
Original line number Diff line number Diff line
@@ -25,35 +25,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

 *

drivers/staging/unisys/uislib/uislib.c

+0 −31
Original line number Diff line number Diff line
@@ -671,8 +671,6 @@ 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,

	       dev_no);

	for (bus = bus_list; bus; bus = bus->next) {

		if (bus->bus_no == bus_no) {

			/* make sure the device number is valid */
@@ -733,12 +731,10 @@ static int destroy_device(struct controlvm_message *msg, char *buf) 
 * kernel paging request"

 */

		if (dev->polling) {

			LOGINF("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");

			uislib_iounmap(dev->chanptr);

		}

		kfree(dev);
@@ -806,7 +802,6 @@ uislib_client_inject_add_bus(u32 bus_no, uuid_le inst_uuid, 
{

	struct controlvm_message msg;



	LOGINF("enter busNo=0x%x\n", bus_no);

	/* step 0: init the chipset */

	POSTCODE_LINUX_3(CHIPSET_INIT_ENTRY_PC, bus_no, POSTCODE_SEVERITY_INFO);
@@ -826,7 +821,6 @@ uislib_client_inject_add_bus(u32 bus_no, uuid_le inst_uuid, 
			LOGERR("init_chipset failed.\n");

			return 0;

		}

		LOGINF("chipset initialized\n");

		POSTCODE_LINUX_3(CHIPSET_INIT_EXIT_PC, bus_no,

				 POSTCODE_SEVERITY_INFO);

	}
@@ -906,7 +900,6 @@ uislib_client_inject_add_vhba(u32 bus_no, u32 dev_no, 
{

	struct controlvm_message msg;



	LOGINF(" enter busNo=0x%x devNo=0x%x\n", bus_no, dev_no);

	/* chipset init'ed with bus bus has been previously created -

	* Verify it still exists step 2: create the VHBA device on the

	* bus
@@ -965,7 +958,6 @@ uislib_client_inject_add_vnic(u32 bus_no, u32 dev_no, 
{

	struct controlvm_message msg;



	LOGINF(" enter busNo=0x%x devNo=0x%x\n", bus_no, dev_no);

	/* chipset init'ed with bus bus has been previously created -

	* Verify it still exists step 2: create the VNIC device on the

	* bus
@@ -1249,7 +1241,6 @@ static int process_incoming(void *v) 
				wait_cycles = (cur_cycles - old_cycles);

		}

	}

	LOGINF("wait_cycles=%llu", wait_cycles);

	cycles_before_wait = wait_cycles;

	idle_cycles = 0;

	poll_dev_start = 0;
@@ -1310,7 +1301,6 @@ static int process_incoming(void *v) 
		if (kthread_should_stop())

			break;

		if (en_smart_wakeup == 0xFF) {

			LOGINF("en_smart_wakeup set to 0xff, to force exiting process_incoming");

			break;

		}

		/* wait for POLLJIFFIES_NORMAL jiffies, or until
@@ -1441,27 +1431,6 @@ uislib_mod_init(void) 
	if (!unisys_spar_platform)

		return -ENODEV;



	LOGINF("MONITORAPIS");



	LOGINF("sizeof(struct uiscmdrsp):%lu bytes\n",

	       (ulong)sizeof(struct uiscmdrsp));

	LOGINF("sizeof(struct phys_info):%lu\n",

	       (ulong)sizeof(struct phys_info));

	LOGINF("sizeof(uiscmdrsp_scsi):%lu\n",

	       (ulong)sizeof(struct uiscmdrsp_scsi));

	LOGINF("sizeof(uiscmdrsp_net):%lu\n",

	       (ulong)sizeof(struct uiscmdrsp_net));

	LOGINF("sizeof(CONTROLVM_MESSAGE):%lu bytes\n",

	       (ulong)sizeof(struct controlvm_message));

	LOGINF("sizeof(struct spar_controlvm_channel_protocol):%lu bytes\n",

	       (ulong)sizeof(struct spar_controlvm_channel_protocol));

	LOGINF("sizeof(CHANNEL_HEADER):%lu bytes\n",

	       (ulong)sizeof(struct channel_header));

	LOGINF("sizeof(struct spar_io_channel_protocol):%lu bytes\n",

	       (ulong)sizeof(struct spar_io_channel_protocol));

	LOGINF("SIZEOF_CMDRSP:%lu bytes\n", SIZEOF_CMDRSP);

	LOGINF("SIZEOF_PROTOCOL:%lu bytes\n", SIZEOF_PROTOCOL);



	/* initialize global pointers to NULL */

	bus_list = NULL;

	bus_list_count = 0;

drivers/staging/unisys/uislib/uisthread.c

+0 −5
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ uisthread_start(struct uisthread_info *thrinfo, 
		return 0;	/* failure */

	}

	thrinfo->id = thrinfo->task->pid;

	LOGINF("started thread pid:%d\n", thrinfo->id);

	return 1;

}

EXPORT_SYMBOL_GPL(uisthread_start);
@@ -60,16 +59,12 @@ uisthread_stop(struct uisthread_info *thrinfo) 
	if (thrinfo->id == 0)

		return;		/* thread not running */



	LOGINF("uisthread_stop stopping id:%d\n", thrinfo->id);

	kthread_stop(thrinfo->task);

	/* give up if the thread has NOT died in 1 minute */

	if (wait_for_completion_timeout(&thrinfo->has_stopped, 60 * HZ))

		stopped = 1;

	else

		LOGERR("timed out trying to signal thread\n");



	if (stopped) {

		LOGINF("uisthread_stop stopped id:%d\n", thrinfo->id);

		thrinfo->id = 0;

	}

}

drivers/staging/unisys/uislib/uisutils.c

+0 −2
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ int 
uisctrl_register_req_handler(int type, void *fptr,

			     struct ultra_vbus_deviceinfo *chipset_driver_info)

{

	LOGINF("type = %d, fptr = 0x%p.\n", type, fptr);



	switch (type) {

	case 2:

		if (fptr) {