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

staging: greybus: move core include files to include/linux/greybus/

With the goal of moving the core of the greybus code out of staging, the
include files need to be moved to include/linux/greybus.h and
include/linux/greybus/

Cc: Vaibhav Hiremath <hvaibhav.linux@gmail.com>
Cc: Johan Hovold <johan@kernel.org>
Cc: Vaibhav Agarwal <vaibhav.sr@gmail.com>
Cc: Rui Miguel Silva <rmfrfs@gmail.com>
Cc: David Lin <dtwlin@gmail.com>
Cc: "Bryan O'Donoghue" <pure.logic@nexus-software.ie>
Cc: greybus-dev@lists.linaro.org
Cc: devel@driverdev.osuosl.org
Acked-by: Mark Greer <mgreer@animalcreek.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Alex Elder <elder@kernel.org>
Link: https://lore.kernel.org/r/20190825055429.18547-8-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Greg Kroah-Hartman ec0ad868 9c319739

+52 -71
+1 -1
drivers/staging/greybus/arche-platform.c
··· 19 19 #include <linux/irq.h> 20 20 #include <linux/suspend.h> 21 21 #include <linux/time.h> 22 + #include <linux/greybus.h> 22 23 #include "arche_platform.h" 23 - #include "greybus.h" 24 24 25 25 #if IS_ENABLED(CONFIG_USB_HSIC_USB3613) 26 26 #include <linux/usb/usb3613.h>
+1 -2
drivers/staging/greybus/audio_apbridgea.c
··· 5 5 * Copyright 2015-2016 Google Inc. 6 6 */ 7 7 8 - #include "greybus.h" 9 - #include "greybus_protocols.h" 8 + #include <linux/greybus.h> 10 9 #include "audio_apbridgea.h" 11 10 #include "audio_codec.h" 12 11
+1 -3
drivers/staging/greybus/audio_codec.h
··· 8 8 #ifndef __LINUX_GBAUDIO_CODEC_H 9 9 #define __LINUX_GBAUDIO_CODEC_H 10 10 11 + #include <linux/greybus.h> 11 12 #include <sound/soc.h> 12 13 #include <sound/jack.h> 13 - 14 - #include "greybus.h" 15 - #include "greybus_protocols.h" 16 14 17 15 #define NAME_SIZE 32 18 16 #define MAX_DAIS 2 /* APB1, APB2 */
+1 -3
drivers/staging/greybus/audio_gb.c
··· 5 5 * Copyright 2015-2016 Google Inc. 6 6 */ 7 7 8 - #include "greybus.h" 9 - #include "greybus_protocols.h" 10 - #include "operation.h" 8 + #include <linux/greybus.h> 11 9 #include "audio_codec.h" 12 10 13 11 /* TODO: Split into separate calls */
+1 -2
drivers/staging/greybus/authentication.c
··· 6 6 * Copyright 2016 Linaro Ltd. 7 7 */ 8 8 9 - #include "greybus.h" 10 - 9 + #include <linux/greybus.h> 11 10 #include <linux/cdev.h> 12 11 #include <linux/fs.h> 13 12 #include <linux/ioctl.h>
+1 -1
drivers/staging/greybus/bootrom.c
··· 10 10 #include <linux/jiffies.h> 11 11 #include <linux/mutex.h> 12 12 #include <linux/workqueue.h> 13 + #include <linux/greybus.h> 13 14 14 - #include "greybus.h" 15 15 #include "firmware.h" 16 16 17 17 /* Timeout, in jiffies, within which the next request must be received */
+1 -1
drivers/staging/greybus/bundle.c
··· 6 6 * Copyright 2014-2015 Linaro Ltd. 7 7 */ 8 8 9 - #include "greybus.h" 9 + #include <linux/greybus.h> 10 10 #include "greybus_trace.h" 11 11 12 12 static ssize_t bundle_class_show(struct device *dev,
drivers/staging/greybus/bundle.h include/linux/greybus/bundle.h
+1 -1
drivers/staging/greybus/camera.c
··· 14 14 #include <linux/string.h> 15 15 #include <linux/uaccess.h> 16 16 #include <linux/vmalloc.h> 17 + #include <linux/greybus.h> 17 18 18 19 #include "gb-camera.h" 19 - #include "greybus.h" 20 20 #include "greybus_protocols.h" 21 21 22 22 enum gb_camera_debugs_buffer_id {
+1 -1
drivers/staging/greybus/connection.c
··· 7 7 */ 8 8 9 9 #include <linux/workqueue.h> 10 + #include <linux/greybus.h> 10 11 11 - #include "greybus.h" 12 12 #include "greybus_trace.h" 13 13 14 14 #define GB_CONNECTION_CPORT_QUIESCE_TIMEOUT 1000
drivers/staging/greybus/connection.h include/linux/greybus/connection.h
+1 -1
drivers/staging/greybus/control.c
··· 9 9 #include <linux/kernel.h> 10 10 #include <linux/module.h> 11 11 #include <linux/slab.h> 12 - #include "greybus.h" 12 + #include <linux/greybus.h> 13 13 14 14 /* Highest control-protocol version supported */ 15 15 #define GB_CONTROL_VERSION_MAJOR 0
drivers/staging/greybus/control.h include/linux/greybus/control.h
+1 -1
drivers/staging/greybus/core.c
··· 9 9 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 10 10 11 11 #define CREATE_TRACE_POINTS 12 - #include "greybus.h" 12 + #include <linux/greybus.h> 13 13 #include "greybus_trace.h" 14 14 15 15 #define GB_BUNDLE_AUTOSUSPEND_MS 3000
+1 -2
drivers/staging/greybus/debugfs.c
··· 7 7 */ 8 8 9 9 #include <linux/debugfs.h> 10 - 11 - #include "greybus.h" 10 + #include <linux/greybus.h> 12 11 13 12 static struct dentry *gb_debug_root; 14 13
+1 -2
drivers/staging/greybus/es2.c
··· 11 11 #include <linux/kfifo.h> 12 12 #include <linux/debugfs.h> 13 13 #include <linux/list.h> 14 + #include <linux/greybus.h> 14 15 #include <asm/unaligned.h> 15 16 16 17 #include "arpc.h" 17 - #include "greybus.h" 18 18 #include "greybus_trace.h" 19 - #include "connection.h" 20 19 21 20 22 21 /* Default timeout for USB vendor requests. */
+1 -1
drivers/staging/greybus/firmware.h
··· 9 9 #ifndef __FIRMWARE_H 10 10 #define __FIRMWARE_H 11 11 12 - #include "greybus.h" 12 + #include <linux/greybus.h> 13 13 14 14 #define FW_NAME_PREFIX "gmp_" 15 15
+1 -1
drivers/staging/greybus/fw-core.c
··· 8 8 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 9 9 10 10 #include <linux/firmware.h> 11 + #include <linux/greybus.h> 11 12 #include "firmware.h" 12 - #include "greybus.h" 13 13 #include "spilib.h" 14 14 15 15 struct gb_fw_core {
+1 -1
drivers/staging/greybus/fw-download.c
··· 10 10 #include <linux/jiffies.h> 11 11 #include <linux/mutex.h> 12 12 #include <linux/workqueue.h> 13 + #include <linux/greybus.h> 13 14 #include "firmware.h" 14 - #include "greybus.h" 15 15 16 16 /* Estimated minimum buffer size, actual size can be smaller than this */ 17 17 #define MIN_FETCH_SIZE 512
+1 -1
drivers/staging/greybus/fw-management.c
··· 13 13 #include <linux/idr.h> 14 14 #include <linux/ioctl.h> 15 15 #include <linux/uaccess.h> 16 + #include <linux/greybus.h> 16 17 17 18 #include "firmware.h" 18 19 #include "greybus_firmware.h" 19 - #include "greybus.h" 20 20 21 21 #define FW_MGMT_TIMEOUT_MS 1000 22 22
+1 -1
drivers/staging/greybus/gbphy.c
··· 13 13 #include <linux/kernel.h> 14 14 #include <linux/slab.h> 15 15 #include <linux/device.h> 16 + #include <linux/greybus.h> 16 17 17 - #include "greybus.h" 18 18 #include "gbphy.h" 19 19 20 20 #define GB_GBPHY_AUTOSUSPEND_MS 3000
+1 -1
drivers/staging/greybus/gpio.c
··· 13 13 #include <linux/irqdomain.h> 14 14 #include <linux/gpio/driver.h> 15 15 #include <linux/mutex.h> 16 + #include <linux/greybus.h> 16 17 17 - #include "greybus.h" 18 18 #include "gbphy.h" 19 19 20 20 struct gb_gpio_line {
+12 -12
drivers/staging/greybus/greybus.h include/linux/greybus.h
··· 20 20 #include <linux/pm_runtime.h> 21 21 #include <linux/idr.h> 22 22 23 - #include "greybus_id.h" 24 - #include "greybus_manifest.h" 25 - #include "greybus_protocols.h" 26 - #include "manifest.h" 27 - #include "hd.h" 28 - #include "svc.h" 29 - #include "control.h" 30 - #include "module.h" 31 - #include "interface.h" 32 - #include "bundle.h" 33 - #include "connection.h" 34 - #include "operation.h" 23 + #include <linux/greybus/greybus_id.h> 24 + #include <linux/greybus/greybus_manifest.h> 25 + #include <linux/greybus/greybus_protocols.h> 26 + #include <linux/greybus/manifest.h> 27 + #include <linux/greybus/hd.h> 28 + #include <linux/greybus/svc.h> 29 + #include <linux/greybus/control.h> 30 + #include <linux/greybus/module.h> 31 + #include <linux/greybus/interface.h> 32 + #include <linux/greybus/bundle.h> 33 + #include <linux/greybus/connection.h> 34 + #include <linux/greybus/operation.h> 35 35 36 36 /* Matches up with the Greybus Protocol specification document */ 37 37 #define GREYBUS_VERSION_MAJOR 0x00
drivers/staging/greybus/greybus_id.h include/linux/greybus/greybus_id.h
drivers/staging/greybus/greybus_manifest.h include/linux/greybus/greybus_manifest.h
drivers/staging/greybus/greybus_protocols.h include/linux/greybus/greybus_protocols.h
+1 -1
drivers/staging/greybus/hd.c
··· 8 8 9 9 #include <linux/kernel.h> 10 10 #include <linux/slab.h> 11 + #include <linux/greybus.h> 11 12 12 - #include "greybus.h" 13 13 #include "greybus_trace.h" 14 14 15 15 EXPORT_TRACEPOINT_SYMBOL_GPL(gb_hd_create);
drivers/staging/greybus/hd.h include/linux/greybus/hd.h
+1 -2
drivers/staging/greybus/hid.c
··· 12 12 #include <linux/module.h> 13 13 #include <linux/mutex.h> 14 14 #include <linux/slab.h> 15 - 16 - #include "greybus.h" 15 + #include <linux/greybus.h> 17 16 18 17 /* Greybus HID device's structure */ 19 18 struct gb_hid {
+1 -1
drivers/staging/greybus/i2c.c
··· 10 10 #include <linux/module.h> 11 11 #include <linux/slab.h> 12 12 #include <linux/i2c.h> 13 + #include <linux/greybus.h> 13 14 14 - #include "greybus.h" 15 15 #include "gbphy.h" 16 16 17 17 struct gb_i2c_device {
+1 -1
drivers/staging/greybus/interface.c
··· 7 7 */ 8 8 9 9 #include <linux/delay.h> 10 + #include <linux/greybus.h> 10 11 11 - #include "greybus.h" 12 12 #include "greybus_trace.h" 13 13 14 14 #define GB_INTERFACE_MODE_SWITCH_TIMEOUT 2000
drivers/staging/greybus/interface.h include/linux/greybus/interface.h
+1 -3
drivers/staging/greybus/light.c
··· 11 11 #include <linux/led-class-flash.h> 12 12 #include <linux/module.h> 13 13 #include <linux/slab.h> 14 + #include <linux/greybus.h> 14 15 #include <media/v4l2-flash-led-class.h> 15 - 16 - #include "greybus.h" 17 - #include "greybus_protocols.h" 18 16 19 17 #define NAMES_MAX 32 20 18
+1 -2
drivers/staging/greybus/log.c
··· 9 9 #include <linux/slab.h> 10 10 #include <linux/sizes.h> 11 11 #include <linux/uaccess.h> 12 - 13 - #include "greybus.h" 12 + #include <linux/greybus.h> 14 13 15 14 struct gb_log { 16 15 struct gb_connection *connection;
+1 -4
drivers/staging/greybus/loopback.c
··· 25 25 #include <linux/workqueue.h> 26 26 #include <linux/atomic.h> 27 27 #include <linux/pm_runtime.h> 28 - 28 + #include <linux/greybus.h> 29 29 #include <asm/div64.h> 30 - 31 - #include "greybus.h" 32 - #include "connection.h" 33 30 34 31 #define NSEC_PER_DAY 86400000000000ULL 35 32
+1 -1
drivers/staging/greybus/manifest.c
··· 6 6 * Copyright 2014-2015 Linaro Ltd. 7 7 */ 8 8 9 - #include "greybus.h" 9 + #include <linux/greybus.h> 10 10 11 11 static const char *get_descriptor_type_string(u8 type) 12 12 {
drivers/staging/greybus/manifest.h include/linux/greybus/manifest.h
+1 -1
drivers/staging/greybus/module.c
··· 6 6 * Copyright 2016 Linaro Ltd. 7 7 */ 8 8 9 - #include "greybus.h" 9 + #include <linux/greybus.h> 10 10 #include "greybus_trace.h" 11 11 12 12 static ssize_t eject_store(struct device *dev,
drivers/staging/greybus/module.h include/linux/greybus/module.h
+1 -1
drivers/staging/greybus/operation.c
··· 12 12 #include <linux/sched.h> 13 13 #include <linux/wait.h> 14 14 #include <linux/workqueue.h> 15 + #include <linux/greybus.h> 15 16 16 - #include "greybus.h" 17 17 #include "greybus_trace.h" 18 18 19 19 static struct kmem_cache *gb_operation_cache;
drivers/staging/greybus/operation.h include/linux/greybus/operation.h
+1 -2
drivers/staging/greybus/power_supply.c
··· 10 10 #include <linux/module.h> 11 11 #include <linux/power_supply.h> 12 12 #include <linux/slab.h> 13 - 14 - #include "greybus.h" 13 + #include <linux/greybus.h> 15 14 16 15 #define PROP_MAX 32 17 16
+1 -1
drivers/staging/greybus/pwm.c
··· 10 10 #include <linux/module.h> 11 11 #include <linux/slab.h> 12 12 #include <linux/pwm.h> 13 + #include <linux/greybus.h> 13 14 14 - #include "greybus.h" 15 15 #include "gbphy.h" 16 16 17 17 struct gb_pwm_chip {
+1 -2
drivers/staging/greybus/raw.c
··· 13 13 #include <linux/fs.h> 14 14 #include <linux/idr.h> 15 15 #include <linux/uaccess.h> 16 - 17 - #include "greybus.h" 16 + #include <linux/greybus.h> 18 17 19 18 struct gb_raw { 20 19 struct gb_connection *connection;
+1 -1
drivers/staging/greybus/sdio.c
··· 12 12 #include <linux/mmc/mmc.h> 13 13 #include <linux/scatterlist.h> 14 14 #include <linux/workqueue.h> 15 + #include <linux/greybus.h> 15 16 16 - #include "greybus.h" 17 17 #include "gbphy.h" 18 18 19 19 struct gb_sdio_host {
+1 -1
drivers/staging/greybus/spi.c
··· 7 7 */ 8 8 9 9 #include <linux/module.h> 10 + #include <linux/greybus.h> 10 11 11 - #include "greybus.h" 12 12 #include "gbphy.h" 13 13 #include "spilib.h" 14 14
+1 -1
drivers/staging/greybus/spilib.c
··· 10 10 #include <linux/kernel.h> 11 11 #include <linux/module.h> 12 12 #include <linux/slab.h> 13 + #include <linux/greybus.h> 13 14 #include <linux/spi/spi.h> 14 15 15 - #include "greybus.h" 16 16 #include "spilib.h" 17 17 18 18 struct gb_spilib {
+1 -2
drivers/staging/greybus/svc.c
··· 8 8 9 9 #include <linux/debugfs.h> 10 10 #include <linux/workqueue.h> 11 - 12 - #include "greybus.h" 11 + #include <linux/greybus.h> 13 12 14 13 #define SVC_INTF_EJECT_TIMEOUT 9000 15 14 #define SVC_INTF_ACTIVATE_TIMEOUT 6000
drivers/staging/greybus/svc.h include/linux/greybus/svc.h
+1 -1
drivers/staging/greybus/svc_watchdog.c
··· 8 8 #include <linux/delay.h> 9 9 #include <linux/suspend.h> 10 10 #include <linux/workqueue.h> 11 - #include "greybus.h" 11 + #include <linux/greybus.h> 12 12 13 13 #define SVC_WATCHDOG_PERIOD (2 * HZ) 14 14
+1 -1
drivers/staging/greybus/uart.c
··· 28 28 #include <linux/kfifo.h> 29 29 #include <linux/workqueue.h> 30 30 #include <linux/completion.h> 31 + #include <linux/greybus.h> 31 32 32 - #include "greybus.h" 33 33 #include "gbphy.h" 34 34 35 35 #define GB_NUM_MINORS 16 /* 16 is more than enough */
+1 -1
drivers/staging/greybus/usb.c
··· 10 10 #include <linux/slab.h> 11 11 #include <linux/usb.h> 12 12 #include <linux/usb/hcd.h> 13 + #include <linux/greybus.h> 13 14 14 - #include "greybus.h" 15 15 #include "gbphy.h" 16 16 17 17 /* Greybus USB request types */
+1 -2
drivers/staging/greybus/vibrator.c
··· 13 13 #include <linux/kdev_t.h> 14 14 #include <linux/idr.h> 15 15 #include <linux/pm_runtime.h> 16 - 17 - #include "greybus.h" 16 + #include <linux/greybus.h> 18 17 19 18 struct gb_vibrator_device { 20 19 struct gb_connection *connection;