drivers: visorbus: move driver out of staging
Move the visorbus driver out of staging (drivers/staging/unisys/visorbus) and to drivers/visorbus. Modify the configuration and makefiles so they now reference the new location. The s-Par header file visorbus.h that is referenced by all s-Par drivers, is being moved into include/linux. Signed-off-by: David Kershner <david.kershner@unisys.com> Reviewed-by: Tim Sell <timothy.sell@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
David Kershner
Greg Kroah-Hartman
Родитель
84f1e4b089
Коммит
93d3ad90c2
|
|
@ -14006,6 +14006,8 @@ UNISYS S-PAR DRIVERS
|
|||
M: David Kershner <david.kershner@unisys.com>
|
||||
L: sparmaintainer@unisys.com (Unisys internal)
|
||||
S: Supported
|
||||
F: include/linux/visorbus.h
|
||||
F: drivers/visorbus/
|
||||
F: drivers/staging/unisys/
|
||||
|
||||
UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
|
||||
|
|
|
|||
|
|
@ -211,4 +211,6 @@ source "drivers/mux/Kconfig"
|
|||
|
||||
source "drivers/opp/Kconfig"
|
||||
|
||||
source "drivers/visorbus/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
|
|
|||
|
|
@ -184,3 +184,4 @@ obj-$(CONFIG_FPGA) += fpga/
|
|||
obj-$(CONFIG_FSI) += fsi/
|
||||
obj-$(CONFIG_TEE) += tee/
|
||||
obj-$(CONFIG_MULTIPLEXER) += mux/
|
||||
obj-$(CONFIG_UNISYS_VISORBUS) += visorbus/
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ menuconfig UNISYSSPAR
|
|||
|
||||
if UNISYSSPAR
|
||||
|
||||
source "drivers/staging/unisys/visorbus/Kconfig"
|
||||
source "drivers/staging/unisys/visornic/Kconfig"
|
||||
source "drivers/staging/unisys/visorinput/Kconfig"
|
||||
source "drivers/staging/unisys/visorhba/Kconfig"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
#
|
||||
# Makefile for Unisys SPAR drivers
|
||||
#
|
||||
obj-$(CONFIG_UNISYS_VISORBUS) += visorbus/
|
||||
obj-$(CONFIG_UNISYS_VISORNIC) += visornic/
|
||||
obj-$(CONFIG_UNISYS_VISORINPUT) += visorinput/
|
||||
obj-$(CONFIG_UNISYS_VISORHBA) += visorhba/
|
||||
|
|
|
|||
|
|
@ -33,8 +33,7 @@
|
|||
|
||||
#include <linux/uuid.h>
|
||||
#include <linux/skbuff.h>
|
||||
|
||||
#include "visorbus.h"
|
||||
#include <linux/visorbus.h>
|
||||
|
||||
/*
|
||||
* Must increment these whenever you insert or delete fields within this channel
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
#include <linux/idr.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/visorbus.h>
|
||||
#include <scsi/scsi.h>
|
||||
#include <scsi/scsi_host.h>
|
||||
#include <scsi/scsi_cmnd.h>
|
||||
#include <scsi/scsi_device.h>
|
||||
|
||||
#include "visorbus.h"
|
||||
#include "iochannel.h"
|
||||
|
||||
/* The Send and Receive Buffers of the IO Queue may both be full */
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@
|
|||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/uuid.h>
|
||||
#include <linux/visorbus.h>
|
||||
|
||||
#include "visorbus.h"
|
||||
#include "ultrainputreport.h"
|
||||
|
||||
/* Keyboard channel {c73416d0-b0b8-44af-b304-9d2ae99f1b3d} */
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@
|
|||
#include <linux/kthread.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/rtnetlink.h>
|
||||
#include <linux/visorbus.h>
|
||||
|
||||
#include "visorbus.h"
|
||||
#include "iochannel.h"
|
||||
|
||||
#define VISORNIC_INFINITE_RSP_WAIT 0
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
config UNISYS_VISORBUS
|
||||
tristate "Unisys visorbus driver"
|
||||
depends on UNISYSSPAR
|
||||
depends on X86_64 && ACPI
|
||||
---help---
|
||||
The visorbus driver is a virtualized bus for the Unisys s-Par firmware.
|
||||
|
|
@ -8,5 +8,3 @@ 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
|
||||
|
|
@ -8,8 +8,7 @@
|
|||
#define __CONTROLVMCHANNEL_H__
|
||||
|
||||
#include <linux/uuid.h>
|
||||
|
||||
#include "visorbus.h"
|
||||
#include <linux/visorbus.h>
|
||||
|
||||
/* {2B3C2D10-7EF5-4ad8-B966-3448B7386B3D} */
|
||||
#define VISOR_CONTROLVM_CHANNEL_GUID \
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
*/
|
||||
|
||||
#include <linux/uuid.h>
|
||||
#include "visorbus.h"
|
||||
#include <linux/visorbus.h>
|
||||
|
||||
/* {193b331b-c58f-11da-95a9-00e08161165f} */
|
||||
#define VISOR_VBUS_CHANNEL_GUID \
|
||||
|
|
@ -8,9 +8,9 @@
|
|||
#include <linux/debugfs.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/visorbus.h>
|
||||
#include <linux/uuid.h>
|
||||
|
||||
#include "visorbus.h"
|
||||
#include "visorbus_private.h"
|
||||
|
||||
static const guid_t visor_vbus_channel_guid = VISOR_VBUS_CHANNEL_GUID;
|
||||
|
|
@ -9,10 +9,10 @@
|
|||
|
||||
#include <linux/uuid.h>
|
||||
#include <linux/utsname.h>
|
||||
#include <linux/visorbus.h>
|
||||
|
||||
#include "controlvmchannel.h"
|
||||
#include "vbuschannel.h"
|
||||
#include "visorbus.h"
|
||||
|
||||
struct visor_device *visorbus_get_device_by_id(u32 bus_no, u32 dev_no,
|
||||
struct visor_device *from);
|
||||
|
|
@ -12,8 +12,8 @@
|
|||
#include <linux/uuid.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/visorbus.h>
|
||||
|
||||
#include "visorbus.h"
|
||||
#include "visorbus_private.h"
|
||||
#include "controlvmchannel.h"
|
||||
|
||||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
#include <linux/acpi.h>
|
||||
#include <linux/crash_dump.h>
|
||||
#include <linux/visorbus.h>
|
||||
|
||||
#include "visorbus.h"
|
||||
#include "visorbus_private.h"
|
||||
|
||||
/* {72120008-4AAB-11DC-8530-444553544200} */
|
||||
Загрузка…
Ссылка в новой задаче