From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966188AbdKQR2Z (ORCPT ); Fri, 17 Nov 2017 12:28:25 -0500 Received: from mail-sn1nam02on0084.outbound.protection.outlook.com ([104.47.36.84]:59101 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752508AbdKQR2J (ORCPT ); Fri, 17 Nov 2017 12:28:09 -0500 Authentication-Results: spf=pass (sender IP is 192.61.61.104) smtp.mailfrom=unisys.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=pass action=none header.from=unisys.com; From: David Kershner To: , , , , , , , Subject: [PATCH 2/2] drivers: visorbus: move driver out of staging Date: Fri, 17 Nov 2017 12:27:39 -0500 Message-ID: <1510939659-15039-3-git-send-email-david.kershner@unisys.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1510939659-15039-1-git-send-email-david.kershner@unisys.com> References: <1510939659-15039-1-git-send-email-david.kershner@unisys.com> X-OriginalArrivalTime: 17 Nov 2017 17:27:51.0090 (UTC) FILETIME=[64F7C120:01D35FC9] MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.61.61.104;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(39860400002)(376002)(346002)(2980300002)(438002)(199003)(189002)(46656002)(48376002)(6666003)(47776003)(53936002)(2950100002)(8676002)(356003)(86362001)(69596002)(81166006)(305945005)(5003940100001)(50466002)(8936002)(81156014)(97736004)(33646002)(106466001)(9306002)(50226002)(575784001)(5660300001)(83796002)(72206003)(478600001)(9746002)(9786002)(68736007)(189998001)(50986999)(2201001)(76176999)(36756003)(16586007)(110136005)(57986006)(316002)(2906002)(106002);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR07MB704;H:USEA-NAEDGE1.unisys.com;FPR:;SPF:Pass;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2NAM05FT034;1:9pommO1dMjsMmb9p6ayxaTdUtXUnGO/dgc6HKzbZtAHDnDE+6VnBcYU7ESep8If3a7KFyMVvtiKWDXEgkrnQcaMa1xGYZKyLsG9KEp243AcVZJUGKYRnDXiazIeUIkie X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3fcff807-c2d4-4a98-893e-08d52de0905c X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258);SRVR:DM2PR07MB704; X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB704;3:llEs9T3hdF/13uZSqRI7tW5BnornjaIMrbzboD6tCgle4aYnf4Y+k+casb9Wsd+Ywj2hPSRq1JPLmr1EySe7S5oYDht+nrMyHtjh2l4t0RAqntnTPfhSwxbOxkaGXmJgjmGP0UsPVUXtSVyNLIb6m4PzZVLQp0Rs2kO2nehaTPrp6wSDNqQv6hvOi8jIEdM0icRlvBOytYXHyDykqLGgsFaXUxBOOmeCRzgSI8a7DjOXQcjzPi7Q3rJ+7vRL3KtJlVfJHC1yi/w4NRyk4U1vgfyTRyRcxHShpXFaj4Zh0+rvNAmkUpIYCtonHDNpE4KmegdO1UGbz9Jt10ZlJihHMZh3nDZUcqxCJAdCMDM5rkg=;25:q9CBdsDCgJvPGBPc0MfqockA8eCrSmbHqSlSKa+RxPdSUx1MfqhBWpgw5zYqtx0nGLbIQJWiFE5xQbvQr5cMwvPNh2w49pTMkEweziRXvKBR2Qzj7eWNwt9NM1ZNTBwMv5oUDMOCvRhh0pkUTp31aCR4/E+noUpzF2FfGyuQglGRQekIEBVDHnIKDgLvyViiuIhhDG0IoLM+QNoPW6k0aNW1bRVVMQVFFDXhz+isX49lyxiozcB61qwc38x7YSUmPeAYsVRdoIQ9OEaDk5h/m/vTyayaBVty6xuBm/UME5WQ0lXlPXNV5xP2wyLM6nr9BBPdcwFudslaN/OMHWmI2w== X-MS-TrafficTypeDiagnostic: DM2PR07MB704: X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB704;31:lX0OiQ1ctyxB37387Hs5sbPbMvUB8DLc3S+pabNk+aeHkNaOYe0JhcIDf7ypMASxotVSiDcFa1L5Cg8UY5/IgG+0QS3sW//TcCavIryA42ME+CnHTptLdcoTAwsop8iz5ywkTB8JoOca4jIC+4/jLEh4p1bQIrKSsm2JdfNxz3GM1hl7kI/QVk5VHhFumn06/gjmUBKylR3cWtHMl4lveFwW9cR4joU5uGiqpyaUQAU=;20:+6b4ZXpnfevsHLKrBHCDBSJ9XlHEGo8JTy3zRueoA9CG3nsh4kgFd12Gl+LDdNUSWg7R/4Jw7e2H9gMV9hYrO3VSid0zrqCn9Mt9r8Fr68yFqltQNVIFUc4u7zaHUiBF6JcNAMxI//wobgxX1A595yOHs1fC4sRWpylN8KEzVdG114npKTljttfwz9YIBFvLYTxh4nKumlUn7TqTvSCeIe6ILLB5JI1tBDZnddlSqK2vEWy4Gkw5nCs9Uf+AgHlnMN2DanWzd/NnBhvMNvtiZ//6FJxCfIP2LdRC48HzdyM2pgfBJUFpPOuOBG8TM5ADcet3AiSUjNb3fQ/cbhhQUocjNrcLd597dAKPygHnfSSMoh77HPIl8Pr2vSHHRT0uIy1v4TcW8q3knvNMsMkY9MF0CkcQJMxjrb07a7AOopcKugc77i5UhEwnnt96BLAKlS+a/clc0CbLZ1qq4cxxM8p/AbTk7+B2og0gzvoFpEiRygqBTPZP4+lSNKqEFCI2 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(174360191007938); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(3002001)(3231022)(93006095)(93004095)(10201501046)(6041248)(20161123562025)(20161123564025)(20161123555025)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:DM2PR07MB704;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:DM2PR07MB704; X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB704;4:uawlt8xD+pfknGJ0zQSIrSbAXrl2vFfoqz2nXoSA7EsriFeepyN9dXYkNiqf9aPjXIiWGoWEK0UlnvAGbR88seAWCKZ0g/uujFZzA9LKVOlYsDnRlE5uobY1MGWXVc5FyG7TmwFlpEirTtpfPA1XdMTPvGylvDZqRBbR++1TnltqMzFrpx17377U2Ib0ddN14dZHzSYld2YNr1e2pVZizHNkFECnWw/MmfMfBYo4ZXHU4pXyDN4AeREERquk4wrLja6wKdE7iUn1rjFpIY4LtATjsaX7ROTe9tuE+DbKOsLe+3Xuh87ntvhkCfMEYSR2 X-Forefront-PRVS: 049486C505 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR07MB704;23:1jt0S5M4xVcKzXrTxni8YdxZGLkF2QKXMRHZLkIHzE?= =?us-ascii?Q?9av1dFZyeyMqyACgdo2+j1an8HTqNG0BhHguq/ye32v+0bkVJk0Yk4k6ztQk?= =?us-ascii?Q?AkNCGffKwWszK3ZatjJIGbHiu0rdYIDLoYZ6aZgRQh0HD9iZU8NnYoXrjFbf?= =?us-ascii?Q?PgyOk2cYu7nToEo9AA8XeA2LLUDsJ/tHt9Rxm3ZrBPEiKao6lIxMw5jR8QWr?= =?us-ascii?Q?fZJJY/QWwetlujs6EI64Y0BLszE6285Fi+1rJYDA/8HalCmYJbmmwi2/bLbz?= =?us-ascii?Q?VCL3JWyJZuL+nPqfz4EsnX2E54ptCZKeXVZ1rdCkmbr0SZA/lfrmaQkJQLSN?= =?us-ascii?Q?QTTYXGa7Yc/+f9Ei8RpV/yADD8fqEhKuSqbCDmRyGJITvUT8PP3sSog5Rzd2?= =?us-ascii?Q?5OkTnYxoTDQuoiWHRxgFydEYxzQWHahoJDjJAlbc0g4a3AFJ72aFvDR03MNn?= =?us-ascii?Q?bT7mgUnOAaUlqFAOsgbbKlUUU45dKNB9x6PbE7ByFvM2Howu/jXthYvyjsQx?= =?us-ascii?Q?FxxZ+8FpxPs0GajnyVDGKCxsJen4CrP/M+pf1E2N0C4qw57m+ylmWoNkAXxf?= =?us-ascii?Q?U8NAel+xiWGiXc0+p77eu7pcPqeyUPBhpM3cIWGqJrU5WYRYOLwJiOdwFaK3?= =?us-ascii?Q?+ODKk3MsJPI/4tGsjGDoGlWbcn6OSDk0g7873O/Fa54T4zGusdBw8E7/fl0o?= =?us-ascii?Q?Ewm21/HGjFdkJB3h96bsrW5c4rKg//1/zIl4uZR+zRl+cMnj3aDFmqRGQQ6C?= =?us-ascii?Q?eJieEu6CGKU7oUStgQ5pHN9XXa4vfKsxOL11Hyg37kXtIkfo91grkQBEjYse?= =?us-ascii?Q?lYcNy4NcfE932iiFj9oI4y3t/1E8ypALf9OKjOJwRuqiAGJqoj20b74BC673?= =?us-ascii?Q?wOw8JpWcLusF19P0VQZ4YFBC0ppJbavR2/qtyZpGcOzY1ua9i/DaBddutWTr?= =?us-ascii?Q?gRICK+rdpvZoadChelwOavI6pBCzSptot9sorhKe9rioiKQvIfNsluwCJ/EA?= =?us-ascii?Q?FwKirkJLvbEFQ1Alj6L3t5nAlfJo9ZmkF8JS6J8sSpxibdbl/6hAPDr0vllW?= =?us-ascii?Q?W0U+3SoC9TOXBkKqDP97CgRCMXjflGLf6KDXOI8baZ9imZ+8LyHifWwwNFsY?= =?us-ascii?Q?6Zs3Ez7yIY43jjw6S5uFLwn+Yhw1KL?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR07MB704;6:/MG24n05fClx4jQLz6OIMYz7cc68/xKg3bCGObQLe066gUPRbRzfOCceYGZf6gdV8O5v2VV1vTibB2AMId1vZIFUTZQlylB+hkk+AT4MiOJVSaiUViVu0L/YYgb9s2DyIRAWtV92AbhzMel/9pFcrtv31Y+Jw5dsTtfgYikttFLh6nCd9wD5XsRZrXnGLXJdNC2SQn2gttmbR/WToL6JnjXdT6j78Sl6NbejPnDJaJEL9fxAIPQH8d5EEe7CPoBsak78SXfGiJHesaw0ldmMbw+U1U5qK4twZhBhg1TivDe4fqlJM1UeWUbZcj7a9IC6mRUalMALqcyi8GQLNlHekO4leaCDRwPpnpG9CeoY+iQ=;5:63OHwZP1CzJg517IKd6Y50pGzhI0HedrIvNHboW+Jh2YmteDInk3M14Q99kvKDTtTdKalcW8qMysobqF9nT6PePmp2YhCKBCpgE8sImY0oGUzlRoTcpFySez1cl77h+iMUcPdwdgjumI8hj0Hd8ebVQ2TuEfPHIOvJy8zc2FH4g=;24:+DTB7Io+nzxSqji57S3kXRPiRUSNfS97Rd6fnm762Za7UEe2PJt3MxyX+ntt1QcWPDHQ5P2T8Wl/Zk7zCTPe90LcP/cYRiUjpLEdqc60Yzo=;7:Q6nxa4KujsVEPtPLe7v6Dbywg/JEYn2JEEpFHcq+IdXKNLj2PS05Oxhd1zRCt9DHOp6XKM0KxoSAWdBHxuoVGXD7QPs/urvFerjzHGbUH4lcrnJrnILdf9mG2NND9kTsOPAI8VCaoIXZ57JvVofx0jDRuW1EW+6WNzHq4YPX7y2LznhAtdXaZWNBrTOvP9ZgwUllDtzCJkctCN4QbUTBIXmJdfc7Y7EW8VMjzKNLJuX6DTxdzJLbChzbKy+Qc0as SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: unisys.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2017 17:28:05.8513 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3fcff807-c2d4-4a98-893e-08d52de0905c X-MS-Exchange-CrossTenant-Id: 8d894c2b-238f-490b-8dd1-d93898c5bf83 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=8d894c2b-238f-490b-8dd1-d93898c5bf83;Ip=[192.61.61.104];Helo=[USEA-NAEDGE1.unisys.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR07MB704 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The s-Par header files that are referenced by all s-Par drivers, are being moved into include/linux/visorbus. Move the visorbus driver out of staging and modify the configuration and makefiles so they now reference the new file, this required moving some lines from drivers/staging/unisys/Kconfig over to drives/visorbus/Kconfig to make sure dependencies were met. Visorbus will now just live in the /drivers directory. Signed-off-by: David Kershner Reviewed-by: David Binder Reviewed-by: Tim Sell --- MAINTAINERS | 2 ++ drivers/Kconfig | 2 ++ drivers/Makefile | 1 + drivers/staging/unisys/Kconfig | 1 - drivers/staging/unisys/Makefile | 1 - drivers/staging/unisys/include/iochannel.h | 3 +-- drivers/staging/unisys/visorhba/visorhba_main.c | 2 +- drivers/staging/unisys/visorinput/visorinput.c | 2 +- drivers/staging/unisys/visornic/visornic_main.c | 2 +- drivers/{staging/unisys => }/visorbus/Kconfig | 4 +++- drivers/{staging/unisys => }/visorbus/Makefile | 2 -- drivers/{staging/unisys => }/visorbus/controlvmchannel.h | 3 +-- drivers/{staging/unisys => }/visorbus/vbuschannel.h | 2 +- drivers/{staging/unisys => }/visorbus/visorbus_main.c | 2 +- drivers/{staging/unisys => }/visorbus/visorbus_private.h | 2 +- drivers/{staging/unisys => }/visorbus/visorchannel.c | 2 +- drivers/{staging/unisys => }/visorbus/visorchipset.c | 2 +- {drivers/staging/unisys/include => include/linux/visorbus}/visorbus.h | 0 .../staging/unisys/include => include/linux/visorbus}/visorchannel.h | 0 19 files changed, 18 insertions(+), 17 deletions(-) rename drivers/{staging/unisys => }/visorbus/Kconfig (90%) rename drivers/{staging/unisys => }/visorbus/Makefile (81%) rename drivers/{staging/unisys => }/visorbus/controlvmchannel.h (99%) rename drivers/{staging/unisys => }/visorbus/vbuschannel.h (98%) rename drivers/{staging/unisys => }/visorbus/visorbus_main.c (99%) rename drivers/{staging/unisys => }/visorbus/visorbus_private.h (98%) rename drivers/{staging/unisys => }/visorbus/visorchannel.c (99%) rename drivers/{staging/unisys => }/visorbus/visorchipset.c (99%) rename {drivers/staging/unisys/include => include/linux/visorbus}/visorbus.h (100%) rename {drivers/staging/unisys/include => include/linux/visorbus}/visorchannel.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 650aa0e..a1df0e9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13835,6 +13835,8 @@ UNISYS S-PAR DRIVERS M: David Kershner L: sparmaintainer@unisys.com (Unisys internal) S: Supported +F: include/linux/visorbus/ +F: drivers/visorbus/ F: drivers/staging/unisys/ UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER diff --git a/drivers/Kconfig b/drivers/Kconfig index 152744c..ef5fb83 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -211,4 +211,6 @@ source "drivers/mux/Kconfig" source "drivers/opp/Kconfig" +source "drivers/visorbus/Kconfig" + endmenu diff --git a/drivers/Makefile b/drivers/Makefile index 1d034b6..d5061ed 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -183,3 +183,4 @@ obj-$(CONFIG_FPGA) += fpga/ obj-$(CONFIG_FSI) += fsi/ obj-$(CONFIG_TEE) += tee/ obj-$(CONFIG_MULTIPLEXER) += mux/ +obj-$(CONFIG_UNISYS_VISORBUS) += visorbus/ diff --git a/drivers/staging/unisys/Kconfig b/drivers/staging/unisys/Kconfig index 4f1f5e6..688b5e3 100644 --- a/drivers/staging/unisys/Kconfig +++ b/drivers/staging/unisys/Kconfig @@ -11,7 +11,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" diff --git a/drivers/staging/unisys/Makefile b/drivers/staging/unisys/Makefile index 20eb098..e45f44b 100644 --- a/drivers/staging/unisys/Makefile +++ b/drivers/staging/unisys/Makefile @@ -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/ diff --git a/drivers/staging/unisys/include/iochannel.h b/drivers/staging/unisys/include/iochannel.h index 5cd407c..6e401a7 100644 --- a/drivers/staging/unisys/include/iochannel.h +++ b/drivers/staging/unisys/include/iochannel.h @@ -43,8 +43,7 @@ #include #include - -#include "visorchannel.h" +#include /* * Must increment these whenever you insert or delete fields within this channel diff --git a/drivers/staging/unisys/visorhba/visorhba_main.c b/drivers/staging/unisys/visorhba/visorhba_main.c index 0bcd3ac..88b04c4 100644 --- a/drivers/staging/unisys/visorhba/visorhba_main.c +++ b/drivers/staging/unisys/visorhba/visorhba_main.c @@ -19,12 +19,12 @@ #include #include #include +#include #include #include #include #include -#include "visorbus.h" #include "iochannel.h" /* The Send and Receive Buffers of the IO Queue may both be full */ diff --git a/drivers/staging/unisys/visorinput/visorinput.c b/drivers/staging/unisys/visorinput/visorinput.c index 450f003..4d88e6c 100644 --- a/drivers/staging/unisys/visorinput/visorinput.c +++ b/drivers/staging/unisys/visorinput/visorinput.c @@ -25,8 +25,8 @@ #include #include #include +#include -#include "visorbus.h" #include "ultrainputreport.h" /* Keyboard channel {c73416d0-b0b8-44af-b304-9d2ae99f1b3d} */ diff --git a/drivers/staging/unisys/visornic/visornic_main.c b/drivers/staging/unisys/visornic/visornic_main.c index 735d7e5..9fd2c8c 100644 --- a/drivers/staging/unisys/visornic/visornic_main.c +++ b/drivers/staging/unisys/visornic/visornic_main.c @@ -25,8 +25,8 @@ #include #include #include +#include -#include "visorbus.h" #include "iochannel.h" #define VISORNIC_INFINITE_RSP_WAIT 0 diff --git a/drivers/staging/unisys/visorbus/Kconfig b/drivers/visorbus/Kconfig similarity index 90% rename from drivers/staging/unisys/visorbus/Kconfig rename to drivers/visorbus/Kconfig index 5113880..a99285a 100644 --- a/drivers/staging/unisys/visorbus/Kconfig +++ b/drivers/visorbus/Kconfig @@ -4,7 +4,9 @@ config UNISYS_VISORBUS tristate "Unisys visorbus driver" - depends on UNISYSSPAR + depends on X86_64 && !UML + select PCI + select ACPI ---help--- The visorbus driver is a virtualized bus for the Unisys s-Par firmware. Virtualized devices allow Linux guests on a system to share disks and diff --git a/drivers/staging/unisys/visorbus/Makefile b/drivers/visorbus/Makefile similarity index 81% rename from drivers/staging/unisys/visorbus/Makefile rename to drivers/visorbus/Makefile index 784cdc1..e8df59d 100644 --- a/drivers/staging/unisys/visorbus/Makefile +++ b/drivers/visorbus/Makefile @@ -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 diff --git a/drivers/staging/unisys/visorbus/controlvmchannel.h b/drivers/visorbus/controlvmchannel.h similarity index 99% rename from drivers/staging/unisys/visorbus/controlvmchannel.h rename to drivers/visorbus/controlvmchannel.h index 9ee9886..3e173ea 100644 --- a/drivers/staging/unisys/visorbus/controlvmchannel.h +++ b/drivers/visorbus/controlvmchannel.h @@ -17,8 +17,7 @@ #define __CONTROLVMCHANNEL_H__ #include - -#include "visorchannel.h" +#include /* {2B3C2D10-7EF5-4ad8-B966-3448B7386B3D} */ #define VISOR_CONTROLVM_CHANNEL_GUID \ diff --git a/drivers/staging/unisys/visorbus/vbuschannel.h b/drivers/visorbus/vbuschannel.h similarity index 98% rename from drivers/staging/unisys/visorbus/vbuschannel.h rename to drivers/visorbus/vbuschannel.h index 981b180..261fe79 100644 --- a/drivers/staging/unisys/visorbus/vbuschannel.h +++ b/drivers/visorbus/vbuschannel.h @@ -26,7 +26,7 @@ */ #include -#include "visorchannel.h" +#include /* {193b331b-c58f-11da-95a9-00e08161165f} */ #define VISOR_VBUS_CHANNEL_GUID \ diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/visorbus/visorbus_main.c similarity index 99% rename from drivers/staging/unisys/visorbus/visorbus_main.c rename to drivers/visorbus/visorbus_main.c index b604d0c..706eb6b 100644 --- a/drivers/staging/unisys/visorbus/visorbus_main.c +++ b/drivers/visorbus/visorbus_main.c @@ -17,9 +17,9 @@ #include #include #include +#include #include -#include "visorbus.h" #include "visorbus_private.h" static const guid_t visor_vbus_channel_guid = VISOR_VBUS_CHANNEL_GUID; diff --git a/drivers/staging/unisys/visorbus/visorbus_private.h b/drivers/visorbus/visorbus_private.h similarity index 98% rename from drivers/staging/unisys/visorbus/visorbus_private.h rename to drivers/visorbus/visorbus_private.h index 4a8b12d..8183e68 100644 --- a/drivers/staging/unisys/visorbus/visorbus_private.h +++ b/drivers/visorbus/visorbus_private.h @@ -18,10 +18,10 @@ #include #include +#include #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); diff --git a/drivers/staging/unisys/visorbus/visorchannel.c b/drivers/visorbus/visorchannel.c similarity index 99% rename from drivers/staging/unisys/visorbus/visorchannel.c rename to drivers/visorbus/visorchannel.c index aae1607..213c4b54 100644 --- a/drivers/staging/unisys/visorbus/visorchannel.c +++ b/drivers/visorbus/visorchannel.c @@ -21,8 +21,8 @@ #include #include #include +#include -#include "visorbus.h" #include "visorbus_private.h" #include "controlvmchannel.h" diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/visorbus/visorchipset.c similarity index 99% rename from drivers/staging/unisys/visorbus/visorchipset.c rename to drivers/visorbus/visorchipset.c index ef2823a..4ed7386 100644 --- a/drivers/staging/unisys/visorbus/visorchipset.c +++ b/drivers/visorbus/visorchipset.c @@ -15,8 +15,8 @@ #include #include +#include -#include "visorbus.h" #include "visorbus_private.h" /* {72120008-4AAB-11DC-8530-444553544200} */ diff --git a/drivers/staging/unisys/include/visorbus.h b/include/linux/visorbus/visorbus.h similarity index 100% rename from drivers/staging/unisys/include/visorbus.h rename to include/linux/visorbus/visorbus.h diff --git a/drivers/staging/unisys/include/visorchannel.h b/include/linux/visorbus/visorchannel.h similarity index 100% rename from drivers/staging/unisys/include/visorchannel.h rename to include/linux/visorbus/visorchannel.h -- 1.9.1