staging: unisys: remove visorbus_private.h

visorbus_private.h is only included from visorbus_main.c and has no
other purpose.  The code can be easily moved into visorbus_main.c.

Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c
index d5556e2cb5efabadb12f59b7b7e2be248cb78e86..13a270dc9b65e50f6bc611fbae4a3bd89949299a 100644 (file)
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -17,12 +17,37 @@
 
 #include <linux/uuid.h>
 
-#include "visorbus_private.h"
+#include "visorbus.h"
+#include "visorchipset.h"
+#include "version.h"
 #include "timskmod.h"
 #include "periodic_work.h"
 #include "vbuschannel.h"
 #include "guestlinuxdebug.h"
 #include "vbusdeviceinfo.h"
+
+/* module parameters */
+int visorbus_debug;
+int visorbus_forcematch;
+int visorbus_forcenomatch;
+#define MAXDEVICETEST 4
+int visorbus_devicetest;
+int visorbus_debugref;
+int visorbus_serialloopbacktest;
+#define SERIALLOOPBACKCHANADDR (100 * 1024 * 1024)
+
+/** This is the private data that we store for each bus device instance.
+ */
+struct visorbus_devdata {
+       int devno;              /* this is the chipset busNo */
+       struct list_head list_all;
+       struct device *dev;
+       struct kobject kobj;
+       struct visorchannel *chan;      /* channel area for bus itself */
+       bool vbus_valid;
+       struct spar_vbus_headerinfo vbus_hdr_info;
+};
+
 /* These forward declarations are required since our drivers are out-of-tree.
  * The structures referenced are kernel-private and are not in the headers, but
  * it is impossible to make a functioning bus driver without them.

diff --git a/drivers/staging/unisys/visorbus/visorbus_private.h b/drivers/staging/unisys/visorbus/visorbus_private.h
deleted file mode 100644 (file)
index 47ab488..0000000
--- a/drivers/staging/unisys/visorbus/visorbus_private.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* visorbus_private.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 __VISORBUS_PRIVATE_H__
-#define __VISORBUS_PRIVATE_H__
-
-#include "timskmod.h"
-#include "visorbus.h"
-#include "visorchipset.h"
-#include "visorbus.h"
-#include "version.h"
-#include "vbuschannel.h"
-
-/* module parameters */
-extern int visorbus_debug;
-extern int visorbus_forcematch;
-extern int visorbus_forcenomatch;
-#define MAXDEVICETEST 4
-extern int visorbus_devicetest;
-extern int visorbus_debugref;
-extern int visorbus_serialloopbacktest;
-#define SERIALLOOPBACKCHANADDR (100 * 1024 * 1024)
-
-/** This is the private data that we store for each bus device instance.
- */
-struct visorbus_devdata {
-       int devno;              /* this is the chipset busNo */
-       struct list_head list_all;
-       struct device *dev;
-       struct kobject kobj;
-       struct visorchannel *chan;      /* channel area for bus itself */
-       bool vbus_valid;
-       struct spar_vbus_headerinfo vbus_hdr_info;
-};
-
-#endif