Commit 1b08872e authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

staging: unisys: remove LOGWRN() macros and uniklog.h 



Remove the last set of macros from uniklog.h. Without LOGWRN() and
friends, uniklog.h is empty so we can delete the file itself as well.

This macro was not used a lot but the file was included in many places.

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

drivers/staging/unisys/include/procobjecttree.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#ifndef __PROCOBJECTTREE_H__

#define __PROCOBJECTTREE_H__



#include "uniklog.h"

#include "timskmod.h"



/* These are opaque structures to users.

drivers/staging/unisys/include/uisqueue.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 


#include "linux/version.h"

#include "iochannel.h"

#include "uniklog.h"

#include <linux/atomic.h>

#include <linux/semaphore.h>

#include <linux/uuid.h>

drivers/staging/unisys/include/uniklog.h

deleted100644 → 0
+0 −57
Original line number Diff line number Diff line 
/* uniklog.h

 *

 * Copyright (C) 2010 - 2013 UNISYS CORPORATION

 * All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or (at

 * your option) any later version.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or

 * NON INFRINGEMENT.  See the GNU General Public License for more

 * details.

 */



/* This module contains macros to aid developers in logging messages.

 *

 * This module is affected by the DEBUG compiletime option.

 *

 */

#ifndef __UNIKLOG_H__

#define __UNIKLOG_H__



#include <linux/printk.h>



/*

 * # LOGWRN

 *

 * \brief Log warning message - Logs a message at the LOG_WARNING level,

 *        including source line number information

 *

 * \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

 * \param string.

 * \return nothing

 *

 * Logs the specified error message at the LOG_WARNING level.  It will also

 * include the file, line number, and function name of where the error

 * originated in the log message.

 */

#define LOGWRN(fmt, args...) pr_warn(fmt, ## args)

#define LOGWRNDEV(devname, fmt, args...) \

	pr_warn("%s " fmt, devname, ## args)

#define LOGWRNNAME(vnic, fmt, args...) \

	do {								\

		if (vnic != NULL) {					\

			pr_warn("%s " fmt, vnic->name, ## args);	\

		} else {						\

			pr_warn(fmt, ## args);				\

		}							\

	} while (0)



#endif /* __UNIKLOG_H__ */

drivers/staging/unisys/uislib/uislib.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/uuid.h>



#include <linux/version.h>

#include "uniklog.h"

#include "diagnostics/appos_subsystems.h"

#include "uisutils.h"

#include "vbuschannel.h"

drivers/staging/unisys/uislib/uisthread.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/signal.h>

#include <linux/sched.h>

#include <linux/kthread.h>

#include "uniklog.h"

#include "uisutils.h"

#include "uisthread.h"