This patch moves the core module to the /drivers/most directory and makes all necessary changes in order to not break the build. Signed-off-by: Christian Gromm <christian.gromm@xxxxxxxxxxxxx> --- v2: v3: v4: drivers/Kconfig | 1 + drivers/Makefile | 1 + drivers/most/Kconfig | 15 +++++++++++++++ drivers/most/Makefile | 4 ++++ drivers/{staging => }/most/configfs.c | 2 +- drivers/{staging => }/most/core.c | 2 +- drivers/staging/most/Kconfig | 6 +++--- drivers/staging/most/Makefile | 5 ----- drivers/staging/most/cdev/cdev.c | 2 +- drivers/staging/most/dim2/dim2.c | 2 +- drivers/staging/most/i2c/i2c.c | 2 +- drivers/staging/most/net/net.c | 2 +- drivers/staging/most/sound/sound.c | 2 +- drivers/staging/most/usb/usb.c | 2 +- drivers/staging/most/video/video.c | 2 +- {drivers/staging/most => include/linux}/most.h | 0 16 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 drivers/most/Kconfig create mode 100644 drivers/most/Makefile rename drivers/{staging => }/most/configfs.c (99%) rename drivers/{staging => }/most/core.c (99%) rename {drivers/staging/most => include/linux}/most.h (100%) diff --git a/drivers/Kconfig b/drivers/Kconfig index 8befa53..c739665 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -228,4 +228,5 @@ source "drivers/interconnect/Kconfig" source "drivers/counter/Kconfig" +source "drivers/most/Kconfig" endmenu diff --git a/drivers/Makefile b/drivers/Makefile index aaef17c..0e1dcbc 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -186,3 +186,4 @@ obj-$(CONFIG_SIOX) += siox/ obj-$(CONFIG_GNSS) += gnss/ obj-$(CONFIG_INTERCONNECT) += interconnect/ obj-$(CONFIG_COUNTER) += counter/ +obj-$(CONFIG_MOST) += most/ diff --git a/drivers/most/Kconfig b/drivers/most/Kconfig new file mode 100644 index 0000000..58d7999 --- /dev/null +++ b/drivers/most/Kconfig @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0 +menuconfig MOST + tristate "MOST support" + depends on HAS_DMA && CONFIGFS_FS + default n + help + Say Y here if you want to enable MOST support. + This driver needs at least one additional component to enable the + desired access from userspace (e.g. character devices) and one that + matches the network controller's hardware interface (e.g. USB). + + To compile this driver as a module, choose M here: the + module will be called most_core. + + If in doubt, say N here. diff --git a/drivers/most/Makefile b/drivers/most/Makefile new file mode 100644 index 0000000..e810cd3 --- /dev/null +++ b/drivers/most/Makefile @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_MOST) += most_core.o +most_core-y := core.o \ + configfs.o diff --git a/drivers/staging/most/configfs.c b/drivers/most/configfs.c similarity index 99% rename from drivers/staging/most/configfs.c rename to drivers/most/configfs.c index 982d1a1..27b0c92 100644 --- a/drivers/staging/most/configfs.c +++ b/drivers/most/configfs.c @@ -10,7 +10,7 @@ #include <linux/slab.h> #include <linux/init.h> #include <linux/configfs.h> -#include <most/most.h> +#include <linux/most.h> #define MAX_STRING_SIZE 80 diff --git a/drivers/staging/most/core.c b/drivers/most/core.c similarity index 99% rename from drivers/staging/most/core.c rename to drivers/most/core.c index 13ab4eece..6a59e87 100644 --- a/drivers/staging/most/core.c +++ b/drivers/most/core.c @@ -20,7 +20,7 @@ #include <linux/kthread.h> #include <linux/dma-mapping.h> #include <linux/idr.h> -#include <most/most.h> +#include <linux/most.h> #define MAX_CHANNELS 64 #define STRING_SIZE 80 diff --git a/drivers/staging/most/Kconfig b/drivers/staging/most/Kconfig index 6262eb2..c5a99f7 100644 --- a/drivers/staging/most/Kconfig +++ b/drivers/staging/most/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 -menuconfig MOST +menuconfig MOST_COMPONENTS tristate "MOST support" - depends on HAS_DMA && CONFIGFS_FS + depends on HAS_DMA && CONFIGFS_FS && MOST default n help Say Y here if you want to enable MOST support. @@ -16,7 +16,7 @@ menuconfig MOST -if MOST +if MOST_COMPONENTS source "drivers/staging/most/cdev/Kconfig" diff --git a/drivers/staging/most/Makefile b/drivers/staging/most/Makefile index 85ea5a4..3c446bb 100644 --- a/drivers/staging/most/Makefile +++ b/drivers/staging/most/Makefile @@ -1,9 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_MOST) += most_core.o -most_core-y := core.o -most_core-y += configfs.o -ccflags-y += -I $(srctree)/drivers/staging/ - obj-$(CONFIG_MOST_CDEV) += cdev/ obj-$(CONFIG_MOST_NET) += net/ obj-$(CONFIG_MOST_SOUND) += sound/ diff --git a/drivers/staging/most/cdev/cdev.c b/drivers/staging/most/cdev/cdev.c index 59f346d..cc1e3de 100644 --- a/drivers/staging/most/cdev/cdev.c +++ b/drivers/staging/most/cdev/cdev.c @@ -16,7 +16,7 @@ #include <linux/kfifo.h> #include <linux/uaccess.h> #include <linux/idr.h> -#include <most/most.h> +#include <linux/most.h> #define CHRDEV_REGION_SIZE 50 diff --git a/drivers/staging/most/dim2/dim2.c b/drivers/staging/most/dim2/dim2.c index 987a91d..6a9c23d 100644 --- a/drivers/staging/most/dim2/dim2.c +++ b/drivers/staging/most/dim2/dim2.c @@ -21,7 +21,7 @@ #include <linux/sched.h> #include <linux/kthread.h> -#include <most/most.h> +#include <linux/most.h> #include "hal.h" #include "errors.h" #include "sysfs.h" diff --git a/drivers/staging/most/i2c/i2c.c b/drivers/staging/most/i2c/i2c.c index d07719c..d4a9cd8 100644 --- a/drivers/staging/most/i2c/i2c.c +++ b/drivers/staging/most/i2c/i2c.c @@ -14,7 +14,7 @@ #include <linux/interrupt.h> #include <linux/err.h> -#include <most/most.h> +#include <linux/most.h> enum { CH_RX, CH_TX, NUM_CHANNELS }; diff --git a/drivers/staging/most/net/net.c b/drivers/staging/most/net/net.c index db42732..d6d5b2a 100644 --- a/drivers/staging/most/net/net.c +++ b/drivers/staging/most/net/net.c @@ -15,7 +15,7 @@ #include <linux/list.h> #include <linux/wait.h> #include <linux/kobject.h> -#include <most/most.h> +#include <linux/most.h> #define MEP_HDR_LEN 8 #define MDP_HDR_LEN 16 diff --git a/drivers/staging/most/sound/sound.c b/drivers/staging/most/sound/sound.c index 23baf4b..1527f41 100644 --- a/drivers/staging/most/sound/sound.c +++ b/drivers/staging/most/sound/sound.c @@ -17,7 +17,7 @@ #include <sound/pcm_params.h> #include <linux/sched.h> #include <linux/kthread.h> -#include <most/most.h> +#include <linux/most.h> #define DRIVER_NAME "sound" #define STRING_SIZE 80 diff --git a/drivers/staging/most/usb/usb.c b/drivers/staging/most/usb/usb.c index 857f916..e8c5a8c 100644 --- a/drivers/staging/most/usb/usb.c +++ b/drivers/staging/most/usb/usb.c @@ -23,7 +23,7 @@ #include <linux/dma-mapping.h> #include <linux/etherdevice.h> #include <linux/uaccess.h> -#include <most/most.h> +#include <linux/most.h> #define USB_MTU 512 #define NO_ISOCHRONOUS_URB 0 diff --git a/drivers/staging/most/video/video.c b/drivers/staging/most/video/video.c index 9e9e45a..ce3a44a 100644 --- a/drivers/staging/most/video/video.c +++ b/drivers/staging/most/video/video.c @@ -21,7 +21,7 @@ #include <media/v4l2-ctrls.h> #include <media/v4l2-fh.h> -#include <most/most.h> +#include <linux/most.h> #define V4L2_CMP_MAX_INPUT 1 diff --git a/drivers/staging/most/most.h b/include/linux/most.h similarity index 100% rename from drivers/staging/most/most.h rename to include/linux/most.h -- 2.7.4 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel