Commit c79b28f7 authored by Prarit Bhargava's avatar Prarit Bhargava Committed by Greg Kroah-Hartman
Browse files

staging: unisys: move visorchipset files to visorbus 



Move visorchipset_main.c and visorchipset.h to visorbus/visorchipset.c and
visorbus/visorbus_private.h.  This leaves an empty visorchipset directory
which can also be destroyed.

As a result of this patch the visorchipset init code now calls the
visorbus_init() directly.  Similarily the visorchipset exit code now
cleans up by calling visorbus_exit().

No other functional changes were made.

Signed-off-by: default avatarPrarit Bhargava <prarit@redhat.com>
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 46168810

drivers/staging/unisys/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ menuconfig UNISYSSPAR 
if UNISYSSPAR



source "drivers/staging/unisys/visorutil/Kconfig"

source "drivers/staging/unisys/visorchipset/Kconfig"

source "drivers/staging/unisys/visorbus/Kconfig"



endif # UNISYSSPAR

drivers/staging/unisys/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2,5 +2,4 @@ 
# Makefile for Unisys SPAR drivers

#

obj-$(CONFIG_UNISYS_VISORUTIL)		+= visorutil/

obj-$(CONFIG_UNISYS_VISORCHIPSET)	+= visorchipset/

obj-$(CONFIG_UNISYS_VISORBUS)		+= visorbus/

drivers/staging/unisys/visorbus/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ 


config UNISYS_VISORBUS

	tristate "Unisys visorbus driver"

	depends on UNISYSSPAR && UNISYS_VISORUTIL && UNISYS_VISORCHIPSET

	depends on UNISYSSPAR && UNISYS_VISORUTIL

	---help---

	If you say Y here, you will enable the Unisys visorbus driver.

drivers/staging/unisys/visorbus/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ obj-$(CONFIG_UNISYS_VISORBUS) += visorbus.o 


visorbus-y := visorbus_main.o

visorbus-y += visorchannel.o

visorbus-y += visorchipset.o



ccflags-y += -Idrivers/staging/unisys/include

ccflags-y += -Idrivers/staging/unisys/visorchipset

ccflags-y += -Idrivers/staging/unisys/common-spar/include

ccflags-y += -Idrivers/staging/unisys/common-spar/include/channels

ccflags-y += -Idrivers/staging/unisys/visorutil

drivers/staging/unisys/visorbus/visorbus_main.c

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



#include "visorbus.h"

#include "visorchipset.h"

#include "visorbus_private.h"

#include "version.h"

#include "timskmod.h"

#include "periodic_work.h"
@@ -26,6 +26,8 @@ 
#include "guestlinuxdebug.h"

#include "vbusdeviceinfo.h"



#define MYDRVNAME "visorbus"



/* module parameters */

int visorbus_debug;

int visorbus_forcematch;
@@ -2033,7 +2035,7 @@ struct channel_size_info { 
	unsigned long max_size;

};



static int __init

int __init

visorbus_init(void)

{

	int rc = 0;
@@ -2077,7 +2079,7 @@ away: 
	return rc;

}



static void

void

visorbus_exit(void)

{

	struct list_head *listentry, *listtmp;
@@ -2135,9 +2137,6 @@ MODULE_PARM_DESC(visorbus_serialloopbacktest, 
		 "non-0 to just create 2 serial devices on the same channel");

int visorbus_serialloopbacktest = 0;



module_init(visorbus_init);

module_exit(visorbus_exit);



MODULE_AUTHOR("Unisys");

MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Supervisor bus driver for service partition: ver " VERSION);

CRA Git | Maintained and supported by SUSTech CRA and CCSE