From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: devel@driverdev.osuosl.org, greybus-dev@lists.linaro.org,
elder@kernel.org, johan@kernel.org
Cc: linux-kernel@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH 9/9] staging: greybus: move es2 to drivers/greybus/
Date: Sun, 25 Aug 2019 07:54:29 +0200 [thread overview]
Message-ID: <20190825055429.18547-10-gregkh@linuxfoundation.org> (raw)
In-Reply-To: <20190825055429.18547-1-gregkh@linuxfoundation.org>
The es2 Greybus host controller has long been stable, so move it out of
drivers/staging/ to drivers/greybus/
Cc: Johan Hovold <johan@kernel.org>
Cc: Alex Elder <elder@kernel.org>
Cc: greybus-dev@lists.linaro.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/greybus/Kconfig | 16 ++++++++++++++++
drivers/greybus/Makefile | 7 +++++++
drivers/{staging => }/greybus/arpc.h | 0
drivers/{staging => }/greybus/es2.c | 2 +-
drivers/staging/greybus/Kconfig | 11 -----------
drivers/staging/greybus/Makefile | 5 -----
6 files changed, 24 insertions(+), 17 deletions(-)
rename drivers/{staging => }/greybus/arpc.h (100%)
rename drivers/{staging => }/greybus/es2.c (99%)
diff --git a/drivers/greybus/Kconfig b/drivers/greybus/Kconfig
index 158d8893114c..b84fcaf8b105 100644
--- a/drivers/greybus/Kconfig
+++ b/drivers/greybus/Kconfig
@@ -14,3 +14,19 @@ menuconfig GREYBUS
To compile this code as a module, chose M here: the module
will be called greybus.ko
+
+if GREYBUS
+
+config GREYBUS_ES2
+ tristate "Greybus ES3 USB host controller"
+ depends on USB
+ ---help---
+ Select this option if you have a Toshiba ES3 USB device that
+ acts as a Greybus "host controller". This device is a bridge
+ from a USB device to a Unipro network.
+
+ To compile this code as a module, chose M here: the module
+ will be called gb-es2.ko
+
+endif # GREYBUS
+
diff --git a/drivers/greybus/Makefile b/drivers/greybus/Makefile
index 03b22616ec7d..9bccdd229aa2 100644
--- a/drivers/greybus/Makefile
+++ b/drivers/greybus/Makefile
@@ -17,3 +17,10 @@ obj-$(CONFIG_GREYBUS) += greybus.o
# needed for trace events
ccflags-y += -I$(src)
+
+# Greybus Host controller drivers
+gb-es2-y := es2.o
+
+obj-$(CONFIG_GREYBUS_ES2) += gb-es2.o
+
+
diff --git a/drivers/staging/greybus/arpc.h b/drivers/greybus/arpc.h
similarity index 100%
rename from drivers/staging/greybus/arpc.h
rename to drivers/greybus/arpc.h
diff --git a/drivers/staging/greybus/es2.c b/drivers/greybus/es2.c
similarity index 99%
rename from drivers/staging/greybus/es2.c
rename to drivers/greybus/es2.c
index 5b755e76d8a4..366716f11b1a 100644
--- a/drivers/staging/greybus/es2.c
+++ b/drivers/greybus/es2.c
@@ -15,7 +15,7 @@
#include <asm/unaligned.h>
#include "arpc.h"
-#include "../../greybus/greybus_trace.h"
+#include "greybus_trace.h"
/* Default timeout for USB vendor requests. */
diff --git a/drivers/staging/greybus/Kconfig b/drivers/staging/greybus/Kconfig
index d03c37e1e6e8..d4777f5a8b90 100644
--- a/drivers/staging/greybus/Kconfig
+++ b/drivers/staging/greybus/Kconfig
@@ -1,17 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
if GREYBUS
-config GREYBUS_ES2
- tristate "Greybus ES3 USB host controller"
- depends on USB
- ---help---
- Select this option if you have a Toshiba ES3 USB device that
- acts as a Greybus "host controller". This device is a bridge
- from a USB device to a Unipro network.
-
- To compile this code as a module, chose M here: the module
- will be called gb-es2.ko
-
config GREYBUS_AUDIO
tristate "Greybus Audio Class driver"
depends on SOUND
diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile
index d16853399c9a..627e44f2a983 100644
--- a/drivers/staging/greybus/Makefile
+++ b/drivers/staging/greybus/Makefile
@@ -2,11 +2,6 @@
# needed for trace events
ccflags-y += -I$(src)
-# Greybus Host controller drivers
-gb-es2-y := es2.o
-
-obj-$(CONFIG_GREYBUS_ES2) += gb-es2.o
-
# Greybus class drivers
gb-bootrom-y := bootrom.o
gb-camera-y := camera.o
--
2.23.0
next prev parent reply other threads:[~2019-08-25 5:55 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-25 5:54 [PATCH 0/9] staging: move greybus core out of staging Greg Kroah-Hartman
2019-08-25 5:54 ` [PATCH 1/9] staging: greybus: fix up SPDX comment in .h files Greg Kroah-Hartman
2019-08-26 5:51 ` Viresh Kumar
2019-08-27 7:58 ` Greg Kroah-Hartman
2019-08-27 9:20 ` Gao Xiang
2019-08-27 15:43 ` Greg Kroah-Hartman
2019-08-27 16:01 ` Gao Xiang
2019-08-25 5:54 ` [PATCH 2/9] staging: greybus: remove license "boilerplate" Greg Kroah-Hartman
2019-08-26 5:52 ` Viresh Kumar
2019-08-27 15:37 ` Mark Greer
2019-08-25 5:54 ` [PATCH 3/9] staging: greybus: hd: Fix up some alignment checkpatch issues Greg Kroah-Hartman
2019-08-26 5:57 ` [greybus-dev] " Viresh Kumar
2019-08-25 5:54 ` [PATCH 4/9] staging: greybus: manifest: " Greg Kroah-Hartman
2019-08-26 6:11 ` [greybus-dev] " Viresh Kumar
2019-08-25 5:54 ` [PATCH 5/9] staging: greybus: log: " Greg Kroah-Hartman
2019-08-26 6:12 ` [greybus-dev] " Viresh Kumar
2019-08-25 5:54 ` [PATCH 6/9] staging: greybus: loopback: " Greg Kroah-Hartman
2019-08-26 6:12 ` [greybus-dev] " Viresh Kumar
2019-08-25 5:54 ` [PATCH 7/9] staging: greybus: move core include files to include/linux/greybus/ Greg Kroah-Hartman
2019-08-26 5:55 ` Viresh Kumar
2019-08-27 15:38 ` Mark Greer
2019-08-25 5:54 ` [PATCH 8/9] staging: greybus: move the greybus core to drivers/greybus Greg Kroah-Hartman
2019-08-26 6:13 ` [greybus-dev] " Viresh Kumar
2019-08-25 5:54 ` Greg Kroah-Hartman [this message]
2019-08-26 6:14 ` [greybus-dev] [PATCH 9/9] staging: greybus: move es2 to drivers/greybus/ Viresh Kumar
2019-08-27 10:43 ` [greybus-dev] [PATCH 0/9] staging: move greybus core out of staging Alex Elder
2019-08-27 13:36 ` Dan Carpenter
2019-08-27 13:45 ` Greg Kroah-Hartman
2019-08-27 14:30 ` Rui Miguel Silva
2019-08-27 15:43 ` Greg KH
2019-08-27 15:57 ` Rui Miguel Silva
2019-08-27 16:59 ` Greg KH
2019-08-27 14:37 ` Dan Carpenter
2019-09-01 17:23 ` Pavel Machek
2019-09-02 6:31 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190825055429.18547-10-gregkh@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=devel@driverdev.osuosl.org \
--cc=elder@kernel.org \
--cc=greybus-dev@lists.linaro.org \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).