Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: most: move core files out of the staging area

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@microchip.com>
Link: https://lore.kernel.org/r/1583845362-26707-2-git-send-email-christian.gromm@microchip.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Christian Gromm and committed by
Greg Kroah-Hartman
b2765275 22dd4acc

+33 -24
+1
drivers/Kconfig
··· 228 228 229 229 source "drivers/counter/Kconfig" 230 230 231 + source "drivers/most/Kconfig" 231 232 endmenu
+1
drivers/Makefile
··· 186 186 obj-$(CONFIG_GNSS) += gnss/ 187 187 obj-$(CONFIG_INTERCONNECT) += interconnect/ 188 188 obj-$(CONFIG_COUNTER) += counter/ 189 + obj-$(CONFIG_MOST) += most/
+15
drivers/most/Kconfig
··· 1 + # SPDX-License-Identifier: GPL-2.0 2 + menuconfig MOST 3 + tristate "MOST support" 4 + depends on HAS_DMA && CONFIGFS_FS 5 + default n 6 + help 7 + Say Y here if you want to enable MOST support. 8 + This driver needs at least one additional component to enable the 9 + desired access from userspace (e.g. character devices) and one that 10 + matches the network controller's hardware interface (e.g. USB). 11 + 12 + To compile this driver as a module, choose M here: the 13 + module will be called most_core. 14 + 15 + If in doubt, say N here.
+4
drivers/most/Makefile
··· 1 + # SPDX-License-Identifier: GPL-2.0 2 + obj-$(CONFIG_MOST) += most_core.o 3 + most_core-y := core.o \ 4 + configfs.o
+3 -3
drivers/staging/most/Kconfig
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 - menuconfig MOST 2 + menuconfig MOST_COMPONENTS 3 3 tristate "MOST support" 4 - depends on HAS_DMA && CONFIGFS_FS 4 + depends on HAS_DMA && CONFIGFS_FS && MOST 5 5 default n 6 6 help 7 7 Say Y here if you want to enable MOST support. ··· 16 16 17 17 18 18 19 - if MOST 19 + if MOST_COMPONENTS 20 20 21 21 source "drivers/staging/most/cdev/Kconfig" 22 22
-3
drivers/staging/most/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 - obj-$(CONFIG_MOST) += most_core.o 3 - most_core-y := core.o 4 - most_core-y += configfs.o 5 2 6 3 obj-$(CONFIG_MOST_CDEV) += cdev/ 7 4 obj-$(CONFIG_MOST_NET) += net/
+1 -2
drivers/staging/most/cdev/cdev.c
··· 16 16 #include <linux/kfifo.h> 17 17 #include <linux/uaccess.h> 18 18 #include <linux/idr.h> 19 - 20 - #include "../most.h" 19 + #include <linux/most.h> 21 20 22 21 #define CHRDEV_REGION_SIZE 50 23 22
+1 -2
drivers/staging/most/configfs.c drivers/most/configfs.c
··· 10 10 #include <linux/slab.h> 11 11 #include <linux/init.h> 12 12 #include <linux/configfs.h> 13 - 14 - #include "most.h" 13 + #include <linux/most.h> 15 14 16 15 #define MAX_STRING_SIZE 80 17 16
+1 -2
drivers/staging/most/core.c drivers/most/core.c
··· 20 20 #include <linux/kthread.h> 21 21 #include <linux/dma-mapping.h> 22 22 #include <linux/idr.h> 23 - 24 - #include "most.h" 23 + #include <linux/most.h> 25 24 26 25 #define MAX_CHANNELS 64 27 26 #define STRING_SIZE 80
+1 -2
drivers/staging/most/dim2/dim2.c
··· 20 20 #include <linux/dma-mapping.h> 21 21 #include <linux/sched.h> 22 22 #include <linux/kthread.h> 23 - 24 - #include "../most.h" 23 + #include <linux/most.h> 25 24 #include "hal.h" 26 25 #include "errors.h" 27 26 #include "sysfs.h"
+1 -2
drivers/staging/most/i2c/i2c.c
··· 13 13 #include <linux/i2c.h> 14 14 #include <linux/interrupt.h> 15 15 #include <linux/err.h> 16 - 17 - #include "../most.h" 16 + #include <linux/most.h> 18 17 19 18 enum { CH_RX, CH_TX, NUM_CHANNELS }; 20 19
drivers/staging/most/most.h include/linux/most.h
+1 -2
drivers/staging/most/net/net.c
··· 15 15 #include <linux/list.h> 16 16 #include <linux/wait.h> 17 17 #include <linux/kobject.h> 18 - 19 - #include "../most.h" 18 + #include <linux/most.h> 20 19 21 20 #define MEP_HDR_LEN 8 22 21 #define MDP_HDR_LEN 16
+1 -2
drivers/staging/most/sound/sound.c
··· 17 17 #include <sound/pcm_params.h> 18 18 #include <linux/sched.h> 19 19 #include <linux/kthread.h> 20 - 21 - #include "../most.h" 20 + #include <linux/most.h> 22 21 23 22 #define DRIVER_NAME "sound" 24 23 #define STRING_SIZE 80
+1 -2
drivers/staging/most/usb/usb.c
··· 23 23 #include <linux/dma-mapping.h> 24 24 #include <linux/etherdevice.h> 25 25 #include <linux/uaccess.h> 26 - 27 - #include "../most.h" 26 + #include <linux/most.h> 28 27 29 28 #define USB_MTU 512 30 29 #define NO_ISOCHRONOUS_URB 0
+1 -2
drivers/staging/most/video/video.c
··· 20 20 #include <media/v4l2-device.h> 21 21 #include <media/v4l2-ctrls.h> 22 22 #include <media/v4l2-fh.h> 23 - 24 - #include "../most.h" 23 + #include <linux/most.h> 25 24 26 25 #define V4L2_CMP_MAX_INPUT 1 27 26