Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 21:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: unisys: move visorchipset files to visorbus

Browse Source 
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: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Prarit Bhargava 2015-05-05 18:36:15 -04:00 committed by Greg Kroah-Hartman
parent 4616881022
commit c79b28f733
9 changed files with 17 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/unisys/Kconfig
View File

@ -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

1
drivers/staging/unisys/Makefile
View File

@ -2,5 +2,4 @@
# Makefile for Unisys SPAR drivers
#
obj-$(CONFIG_UNISYS_VISORUTIL) += visorutil/
obj-$(CONFIG_UNISYS_VISORCHIPSET) += visorchipset/
obj-$(CONFIG_UNISYS_VISORBUS) += visorbus/

2
drivers/staging/unisys/visorbus/Kconfig
View File

@ -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.

2
drivers/staging/unisys/visorbus/Makefile
View File

@ -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

11
drivers/staging/unisys/visorbus/visorbus_main.c
View File

@ -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);

4
drivers/staging/unisys/visorchipset/visorchipset.h → drivers/staging/unisys/visorbus/visorbus_private.h
View File

@ -211,4 +211,8 @@ void visorchipset_cache_free(struct kmem_cache *pool, void *p,
int visorchipset_file_init(dev_t majorDev,
struct visorchannel **pControlVm_channel);
void visorchipset_file_cleanup(dev_t major_dev);
/* visorbus init and exit functions */
int __init visorbus_init(void);
void visorbus_exit(void);
#endif

9
drivers/staging/unisys/visorchipset/visorchipset_main.c → drivers/staging/unisys/visorbus/visorchipset.c
View File

@ -24,7 +24,7 @@
#include "uisutils.h"
#include "controlvmcompletionstatus.h"
#include "guestlinuxdebug.h"
#include "visorchipset.h"
#include "visorbus_private.h"
#include <linux/ctype.h>
@ -168,7 +168,7 @@ static struct visor_livedump_info livedump_info;
* process it again the next time controlvm_periodic_work() runs.
*/
static struct controlvm_message controlvm_pending_msg;
static bool controlvm_pending_msg_valid = false;
static bool controlvm_pending_msg_valid;
/* This identifies a data buffer that has been received via a controlvm messages
* in a remote --> local CONTROLVM_TRANSMIT_FILE conversation.
@ -2783,7 +2783,8 @@ visorchipset_init(void)
goto cleanup;
}
POSTCODE_LINUX_2(CHIPSET_INIT_SUCCESS_PC, POSTCODE_SEVERITY_INFO);
rc = 0;
rc = visorbus_init();
cleanup:
if (rc) {
POSTCODE_LINUX_3(CHIPSET_INIT_FAILURE_PC, rc,
@ -2806,6 +2807,8 @@ visorchipset_exit(void)
{
POSTCODE_LINUX_2(DRIVER_EXIT_PC, POSTCODE_SEVERITY_INFO);
visorbus_exit();
if (visorchipset_disable_controlvm) {
;
} else {

11
drivers/staging/unisys/visorchipset/Kconfig
View File

@ -1,11 +0,0 @@
#
# Unisys visorchipset configuration
#
config UNISYS_VISORCHIPSET
tristate "Unisys visorchipset driver"
select UNISYS_VISORUTIL
select UNISYS_VISORBUS
---help---
If you say Y here, you will enable the Unisys visorchipset driver.

15
drivers/staging/unisys/visorchipset/Makefile
View File

@ -1,15 +0,0 @@
#
# Makefile for Unisys visorchipset
#
obj-$(CONFIG_UNISYS_VISORCHIPSET) += visorchipset.o
visorchipset-y := visorchipset_main.o
ccflags-y += -Idrivers/staging/unisys/include
ccflags-y += -Idrivers/staging/unisys/uislib
ccflags-y += -Idrivers/staging/unisys/common-spar/include
ccflags-y += -Idrivers/staging/unisys/common-spar/include/channels
ccflags-y += -Idrivers/staging/unisys/visorutil
ccflags-y += -Idrivers/staging/unisys/visorbus
ccflags-y += -Iinclude/generated