staging: unisys: remove timskmod.h and procobjecttree.h
authorErik Arfvidson <erik.arfvidson@unisys.com>
Tue, 5 May 2015 22:37:06 +0000 (18:37 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 May 2015 13:27:32 +0000 (15:27 +0200)
This patch move the needed linux include files from timskmod.h
to the files that calls those include. Also procobjecttree.h is
removed since it is dead code.

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/unisys/include/periodic_work.h
drivers/staging/unisys/include/procobjecttree.h [deleted file]
drivers/staging/unisys/include/sparstop.h
drivers/staging/unisys/include/timskmod.h [deleted file]
drivers/staging/unisys/include/visorbus.h
drivers/staging/unisys/visorbus/visorbus_main.c
drivers/staging/unisys/visorbus/visorbus_private.h
drivers/staging/unisys/visorbus/visorchipset.c
drivers/staging/unisys/visorchannel/globals.h
drivers/staging/unisys/visorutil/periodic_work.c

index 65bad08dcb01419d23320dfd5c6b9457e9d8bafd..4e19c28dc3d0e1653243013ae69c0f7884092ab3 100644 (file)
@@ -18,7 +18,8 @@
 #ifndef __PERIODIC_WORK_H__
 #define __PERIODIC_WORK_H__
 
-#include "timskmod.h"
+#include <linux/seq_file.h>
+#include <linux/slab.h>
 
 
 /* PERIODIC_WORK an opaque structure to users.
diff --git a/drivers/staging/unisys/include/procobjecttree.h b/drivers/staging/unisys/include/procobjecttree.h
deleted file mode 100644 (file)
index 809c679..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/* procobjecttree.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.
- */
-
-/** @file *********************************************************************
- *
- *  This describes the interfaces necessary for creating a tree of types,
- *  objects, and properties in /proc.
- *
- ******************************************************************************
- */
-
-#ifndef __PROCOBJECTTREE_H__
-#define __PROCOBJECTTREE_H__
-
-#include "timskmod.h"
-
-/* These are opaque structures to users.
- * Fields are declared only in the implementation .c files.
- */
-typedef struct MYPROCOBJECT_Tag MYPROCOBJECT;
-typedef struct MYPROCTYPE_Tag   MYPROCTYPE;
-
-MYPROCOBJECT *visor_proc_CreateObject(MYPROCTYPE *type, const char *name,
-                                     void *context);
-void          visor_proc_DestroyObject(MYPROCOBJECT *obj);
-MYPROCTYPE   *visor_proc_CreateType(struct proc_dir_entry *procRootDir,
-                                   const char **name,
-                                   const char **propertyNames,
-                                   void (*show_property)(struct seq_file *,
-                                                         void *, int));
-void          visor_proc_DestroyType(MYPROCTYPE *type);
-
-#endif
index 05837399a741dadf6f8df6c4485d2d25d4368608..6150d2d58d69c9b6057e8e26e0e0f00632aec277 100644 (file)
@@ -18,7 +18,6 @@
 #ifndef __SPARSTOP_H__
 #define __SPARSTOP_H__
 
-#include "timskmod.h"
 #include "version.h"
 #include <linux/ctype.h>
 
diff --git a/drivers/staging/unisys/include/timskmod.h b/drivers/staging/unisys/include/timskmod.h
deleted file mode 100644 (file)
index 30d8e7a..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/* timskmod.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.
- */
-
-#ifndef __TIMSKMOD_H__
-#define __TIMSKMOD_H__
-
-#include <linux/version.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/device.h>
-#include <linux/kobject.h>
-#include <linux/sysfs.h>
-#include <linux/fs.h>
-#include <linux/string.h>
-#include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <linux/slab.h>
-#include <linux/errno.h>
-#include <linux/interrupt.h>
-#include <linux/wait.h>
-#include <linux/vmalloc.h>
-#include <linux/proc_fs.h>
-#include <linux/cdev.h>
-#include <linux/types.h>
-#include <asm/irq.h>
-#include <linux/io.h>
-#include <asm/dma.h>
-#include <linux/uaccess.h>
-#include <linux/list.h>
-#include <linux/poll.h>
-/* #define EXPORT_SYMTAB */
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/fcntl.h>
-#include <linux/workqueue.h>
-#include <linux/kthread.h>
-#include <linux/seq_file.h>
-#include <linux/mm.h>
-
-#endif
index f97e203c2e7f380668e0f17d0fcdf5ea74e80aa1..0f1966ceda6ce23c13af7df6c7d1924ffebc85da 100644 (file)
@@ -31,6 +31,7 @@
 
 #include <linux/device.h>
 #include <linux/module.h>
+#include <linux/poll.h>
 #include <linux/kernel.h>
 #include <linux/uuid.h>
 
index 914298b73282b325d2b8a9542f4d21a8a497618b..2e00e424958273aab97895af6658e32a92e0f300 100644 (file)
@@ -20,7 +20,6 @@
 #include "visorbus.h"
 #include "visorbus_private.h"
 #include "version.h"
-#include "timskmod.h"
 #include "periodic_work.h"
 #include "vbuschannel.h"
 #include "guestlinuxdebug.h"
index 32e26ed5208558e375bf94431baaee1ff74e449a..8326e4da56c14cc4e3e645082bd0a967113652ec 100644 (file)
@@ -22,7 +22,6 @@
 
 #include "channel.h"
 #include "controlvmchannel.h"
-#include "procobjecttree.h"
 #include "vbusdeviceinfo.h"
 #include "vbushelper.h"
 
index 8ff79c0eeff23b01e2c0fd12c0c133231e7c1129..776bf2e59026858c6c0731193c626da9ec522b6a 100644 (file)
@@ -16,6 +16,7 @@
  */
 
 #include <linux/acpi.h>
+#include <linux/cdev.h>
 #include <linux/ctype.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
@@ -29,7 +30,6 @@
 #include "controlvmcompletionstatus.h"
 #include "guestlinuxdebug.h"
 #include "periodic_work.h"
-#include "procobjecttree.h"
 #include "uisutils.h"
 #include "version.h"
 #include "visorbus.h"
index 6530413958d43e49a046ac0b9c795b3f27afecd4..1c3c427e3e138e7889f316a873f536c8a41dd1ce 100644 (file)
@@ -18,7 +18,6 @@
 #ifndef __VISORCHANNEL_GLOBALS_H__
 #define __VISORCHANNEL_GLOBALS_H__
 
-#include "timskmod.h"
 #include "version.h"
 
 #define MYDRVNAME "visorchannel"
index aa0c1f8757297e8ed6c48a895b878801560b2aab..3562e8b2824bff1d9db019d47c62ef8afe6a4f1c 100644 (file)
@@ -20,7 +20,6 @@
  */
 #include <linux/sched.h>
 
-#include "timskmod.h"
 #include "periodic_work.h"
 
 #define MYDRVNAME "periodic_work"