From: Erik Arfvidson <erik.arfvidson@xxxxxxxxxx> 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@xxxxxxxxxx> Signed-off-by: Benjamin Romer <benjamin.romer@xxxxxxxxxx> --- drivers/staging/unisys/include/periodic_work.h | 3 +- drivers/staging/unisys/include/procobjecttree.h | 47 ------------------- drivers/staging/unisys/include/sparstop.h | 1 - drivers/staging/unisys/include/timskmod.h | 54 ---------------------- drivers/staging/unisys/include/visorbus.h | 1 + drivers/staging/unisys/visorbus/visorbus_main.c | 1 - drivers/staging/unisys/visorbus/visorbus_private.h | 1 - drivers/staging/unisys/visorbus/visorchipset.c | 2 +- drivers/staging/unisys/visorchannel/globals.h | 1 - drivers/staging/unisys/visorutil/periodic_work.c | 1 - 10 files changed, 4 insertions(+), 108 deletions(-) delete mode 100644 drivers/staging/unisys/include/procobjecttree.h delete mode 100644 drivers/staging/unisys/include/timskmod.h diff --git a/drivers/staging/unisys/include/periodic_work.h b/drivers/staging/unisys/include/periodic_work.h index 65bad08..4e19c28 100644 --- a/drivers/staging/unisys/include/periodic_work.h +++ b/drivers/staging/unisys/include/periodic_work.h @@ -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 index 809c679..0000000 --- a/drivers/staging/unisys/include/procobjecttree.h +++ /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 diff --git a/drivers/staging/unisys/include/sparstop.h b/drivers/staging/unisys/include/sparstop.h index 0583739..6150d2d 100644 --- a/drivers/staging/unisys/include/sparstop.h +++ b/drivers/staging/unisys/include/sparstop.h @@ -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 index 30d8e7a..0000000 --- a/drivers/staging/unisys/include/timskmod.h +++ /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 diff --git a/drivers/staging/unisys/include/visorbus.h b/drivers/staging/unisys/include/visorbus.h index f97e203..0f1966c 100644 --- a/drivers/staging/unisys/include/visorbus.h +++ b/drivers/staging/unisys/include/visorbus.h @@ -31,6 +31,7 @@ #include <linux/device.h> #include <linux/module.h> +#include <linux/poll.h> #include <linux/kernel.h> #include <linux/uuid.h> diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c index 914298b..2e00e42 100644 --- a/drivers/staging/unisys/visorbus/visorbus_main.c +++ b/drivers/staging/unisys/visorbus/visorbus_main.c @@ -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" diff --git a/drivers/staging/unisys/visorbus/visorbus_private.h b/drivers/staging/unisys/visorbus/visorbus_private.h index 32e26ed..8326e4d 100644 --- a/drivers/staging/unisys/visorbus/visorbus_private.h +++ b/drivers/staging/unisys/visorbus/visorbus_private.h @@ -22,7 +22,6 @@ #include "channel.h" #include "controlvmchannel.h" -#include "procobjecttree.h" #include "vbusdeviceinfo.h" #include "vbushelper.h" diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c index 8ff79c0..776bf2e 100644 --- a/drivers/staging/unisys/visorbus/visorchipset.c +++ b/drivers/staging/unisys/visorbus/visorchipset.c @@ -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" diff --git a/drivers/staging/unisys/visorchannel/globals.h b/drivers/staging/unisys/visorchannel/globals.h index 6530413..1c3c427 100644 --- a/drivers/staging/unisys/visorchannel/globals.h +++ b/drivers/staging/unisys/visorchannel/globals.h @@ -18,7 +18,6 @@ #ifndef __VISORCHANNEL_GLOBALS_H__ #define __VISORCHANNEL_GLOBALS_H__ -#include "timskmod.h" #include "version.h" #define MYDRVNAME "visorchannel" diff --git a/drivers/staging/unisys/visorutil/periodic_work.c b/drivers/staging/unisys/visorutil/periodic_work.c index aa0c1f8..3562e8b 100644 --- a/drivers/staging/unisys/visorutil/periodic_work.c +++ b/drivers/staging/unisys/visorutil/periodic_work.c @@ -20,7 +20,6 @@ */ #include <linux/sched.h> -#include "timskmod.h" #include "periodic_work.h" #define MYDRVNAME "periodic_work" -- 2.1.4 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
