History

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/

Greg Kroah-Hartman committed 7 years ago

Commit ec0ad861 parent 9c3197353 files · +52 −71Browse files

Unified · Split

53 files
  1. drivers/staging/greybus/arche-platform.c +1 −1
  2. drivers/staging/greybus/audio_apbridgea.c +1 −2
  3. drivers/staging/greybus/audio_codec.h +1 −3
  4. drivers/staging/greybus/audio_gb.c +1 −3
  5. drivers/staging/greybus/authentication.c +1 −2
  6. drivers/staging/greybus/bootrom.c +1 −1
  7. drivers/staging/greybus/bundle.c +1 −1
  8. drivers/staging/greybus/camera.c +1 −1
  9. drivers/staging/greybus/connection.c +1 −1
  10. drivers/staging/greybus/control.c +1 −1
  11. drivers/staging/greybus/core.c +1 −1
  12. drivers/staging/greybus/debugfs.c +1 −2
  13. drivers/staging/greybus/es2.c +1 −2
  14. drivers/staging/greybus/firmware.h +1 −1
  15. drivers/staging/greybus/fw-core.c +1 −1
  16. drivers/staging/greybus/fw-download.c +1 −1
  17. drivers/staging/greybus/fw-management.c +1 −1
  18. drivers/staging/greybus/gbphy.c +1 −1
  19. drivers/staging/greybus/gpio.c +1 −1
  20. drivers/staging/greybus/hd.c +1 −1
  21. drivers/staging/greybus/hid.c +1 −2
  22. drivers/staging/greybus/i2c.c +1 −1
  23. drivers/staging/greybus/interface.c +1 −1
  24. drivers/staging/greybus/light.c +1 −3
  25. drivers/staging/greybus/log.c +1 −2
  26. drivers/staging/greybus/loopback.c +1 −4
  27. drivers/staging/greybus/manifest.c +1 −1
  28. drivers/staging/greybus/module.c +1 −1
  29. drivers/staging/greybus/operation.c +1 −1
  30. drivers/staging/greybus/power_supply.c +1 −2
  31. drivers/staging/greybus/pwm.c +1 −1
  32. drivers/staging/greybus/raw.c +1 −2
  33. drivers/staging/greybus/sdio.c +1 −1
  34. drivers/staging/greybus/spi.c +1 −1
  35. drivers/staging/greybus/spilib.c +1 −1
  36. drivers/staging/greybus/svc.c +1 −2
  37. drivers/staging/greybus/svc_watchdog.c +1 −1
  38. drivers/staging/greybus/uart.c +1 −1
  39. drivers/staging/greybus/usb.c +1 −1
  40. drivers/staging/greybus/vibrator.c +1 −2
  41. include/linux/greybus.h +12 −12
  42. include/linux/greybus/bundle.h +0 −0
  43. include/linux/greybus/connection.h +0 −0
  44. include/linux/greybus/control.h +0 −0
  45. include/linux/greybus/greybus_id.h +0 −0
  46. include/linux/greybus/greybus_manifest.h +0 −0
  47. include/linux/greybus/greybus_protocols.h +0 −0
  48. include/linux/greybus/hd.h +0 −0
  49. include/linux/greybus/interface.h +0 −0
  50. include/linux/greybus/manifest.h +0 −0
  51. include/linux/greybus/module.h +0 −0
  52. include/linux/greybus/operation.h +0 −0
  53. include/linux/greybus/svc.h +0 −0
drivers/staging/greybus/arche-platform.c+1−1
@@ -19,8 +19,8 @@ · 18 unmodified lines
1919 #include <linux/irq.h>
2020 #include <linux/suspend.h>
2121 #include <linux/time.h>
22+#include <linux/greybus.h>
2223 #include "arche_platform.h"
23−#include "greybus.h"
2424
2525 #if IS_ENABLED(CONFIG_USB_HSIC_USB3613)
2626 #include <linux/usb/usb3613.h>
drivers/staging/greybus/audio_apbridgea.c+1−2
@@ -5,8 +5,7 @@ · 4 unmodified lines
55 * Copyright 2015-2016 Google Inc.
66 */
77
8−#include "greybus.h"
9−#include "greybus_protocols.h"
8+#include <linux/greybus.h>
109 #include "audio_apbridgea.h"
1110 #include "audio_codec.h"
1211
drivers/staging/greybus/audio_codec.h+1−3
@@ -8,12 +8,10 @@ · 7 unmodified lines
88 #ifndef __LINUX_GBAUDIO_CODEC_H
99 #define __LINUX_GBAUDIO_CODEC_H
1010
11+#include <linux/greybus.h>
1112 #include <sound/soc.h>
1213 #include <sound/jack.h>
1314
14−#include "greybus.h"
15−#include "greybus_protocols.h"
16−
1715 #define NAME_SIZE 32
1816 #define MAX_DAIS 2 /* APB1, APB2 */
1917
drivers/staging/greybus/audio_gb.c+1−3
@@ -5,9 +5,7 @@ · 4 unmodified lines
55 * Copyright 2015-2016 Google Inc.
66 */
77
8−#include "greybus.h"
9−#include "greybus_protocols.h"
10−#include "operation.h"
8+#include <linux/greybus.h>
119 #include "audio_codec.h"
1210
1311 /* TODO: Split into separate calls */
drivers/staging/greybus/authentication.c+1−2
@@ -6,8 +6,7 @@ · 5 unmodified lines
66 * Copyright 2016 Linaro Ltd.
77 */
88
9−#include "greybus.h"
10−
9+#include <linux/greybus.h>
1110 #include <linux/cdev.h>
1211 #include <linux/fs.h>
1312 #include <linux/ioctl.h>
drivers/staging/greybus/bootrom.c+1−1
@@ -10,8 +10,8 @@ · 9 unmodified lines
1010 #include <linux/jiffies.h>
1111 #include <linux/mutex.h>
1212 #include <linux/workqueue.h>
13+#include <linux/greybus.h>
1314
14−#include "greybus.h"
1515 #include "firmware.h"
1616
1717 /* Timeout, in jiffies, within which the next request must be received */
drivers/staging/greybus/bundle.c+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 * Copyright 2014-2015 Linaro Ltd.
77 */
88
9−#include "greybus.h"
9+#include <linux/greybus.h>
1010 #include "greybus_trace.h"
1111
1212 static ssize_t bundle_class_show(struct device *dev,
drivers/staging/greybus/camera.c+1−1
@@ -14,9 +14,9 @@ · 13 unmodified lines
1414 #include <linux/string.h>
1515 #include <linux/uaccess.h>
1616 #include <linux/vmalloc.h>
17+#include <linux/greybus.h>
1718
1819 #include "gb-camera.h"
19−#include "greybus.h"
2020 #include "greybus_protocols.h"
2121
2222 enum gb_camera_debugs_buffer_id {
drivers/staging/greybus/connection.c+1−1
@@ -7,8 +7,8 @@ · 6 unmodified lines
77 */
88
99 #include <linux/workqueue.h>
10+#include <linux/greybus.h>
1011
11−#include "greybus.h"
1212 #include "greybus_trace.h"
1313
1414 #define GB_CONNECTION_CPORT_QUIESCE_TIMEOUT 1000
drivers/staging/greybus/control.c+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
99 #include <linux/kernel.h>
1010 #include <linux/module.h>
1111 #include <linux/slab.h>
12−#include "greybus.h"
12+#include <linux/greybus.h>
1313
1414 /* Highest control-protocol version supported */
1515 #define GB_CONTROL_VERSION_MAJOR 0
drivers/staging/greybus/core.c+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
99 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
1010
1111 #define CREATE_TRACE_POINTS
12−#include "greybus.h"
12+#include <linux/greybus.h>
1313 #include "greybus_trace.h"
1414
1515 #define GB_BUNDLE_AUTOSUSPEND_MS 3000
drivers/staging/greybus/debugfs.c+1−2
@@ -7,8 +7,7 @@ · 6 unmodified lines
77 */
88
99 #include <linux/debugfs.h>
10−
11−#include "greybus.h"
10+#include <linux/greybus.h>
1211
1312 static struct dentry *gb_debug_root;
1413
drivers/staging/greybus/es2.c+1−2
@@ -11,12 +11,11 @@ · 10 unmodified lines
1111 #include <linux/kfifo.h>
1212 #include <linux/debugfs.h>
1313 #include <linux/list.h>
14+#include <linux/greybus.h>
1415 #include <asm/unaligned.h>
1516
1617 #include "arpc.h"
17−#include "greybus.h"
1818 #include "greybus_trace.h"
19−#include "connection.h"
2019
2120
2221 /* Default timeout for USB vendor requests. */
drivers/staging/greybus/firmware.h+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
99 #ifndef __FIRMWARE_H
1010 #define __FIRMWARE_H
1111
12−#include "greybus.h"
12+#include <linux/greybus.h>
1313
1414 #define FW_NAME_PREFIX "gmp_"
1515
drivers/staging/greybus/fw-core.c+1−1
@@ -8,8 +8,8 @@ · 7 unmodified lines
88 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
99
1010 #include <linux/firmware.h>
11+#include <linux/greybus.h>
1112 #include "firmware.h"
12−#include "greybus.h"
1313 #include "spilib.h"
1414
1515 struct gb_fw_core {
drivers/staging/greybus/fw-download.c+1−1
@@ -10,8 +10,8 @@ · 9 unmodified lines
1010 #include <linux/jiffies.h>
1111 #include <linux/mutex.h>
1212 #include <linux/workqueue.h>
13+#include <linux/greybus.h>
1314 #include "firmware.h"
14−#include "greybus.h"
1515
1616 /* Estimated minimum buffer size, actual size can be smaller than this */
1717 #define MIN_FETCH_SIZE 512
drivers/staging/greybus/fw-management.c+1−1
@@ -13,10 +13,10 @@ · 12 unmodified lines
1313 #include <linux/idr.h>
1414 #include <linux/ioctl.h>
1515 #include <linux/uaccess.h>
16+#include <linux/greybus.h>
1617
1718 #include "firmware.h"
1819 #include "greybus_firmware.h"
19−#include "greybus.h"
2020
2121 #define FW_MGMT_TIMEOUT_MS 1000
2222
drivers/staging/greybus/gbphy.c+1−1
@@ -13,8 +13,8 @@ · 12 unmodified lines
1313 #include <linux/kernel.h>
1414 #include <linux/slab.h>
1515 #include <linux/device.h>
16+#include <linux/greybus.h>
1617
17−#include "greybus.h"
1818 #include "gbphy.h"
1919
2020 #define GB_GBPHY_AUTOSUSPEND_MS 3000
drivers/staging/greybus/gpio.c+1−1
@@ -13,8 +13,8 @@ · 12 unmodified lines
1313 #include <linux/irqdomain.h>
1414 #include <linux/gpio/driver.h>
1515 #include <linux/mutex.h>
16+#include <linux/greybus.h>
1617
17−#include "greybus.h"
1818 #include "gbphy.h"
1919
2020 struct gb_gpio_line {
drivers/staging/greybus/hd.c+1−1
@@ -8,8 +8,8 @@ · 7 unmodified lines
88
99 #include <linux/kernel.h>
1010 #include <linux/slab.h>
11+#include <linux/greybus.h>
1112
12−#include "greybus.h"
1313 #include "greybus_trace.h"
1414
1515 EXPORT_TRACEPOINT_SYMBOL_GPL(gb_hd_create);
drivers/staging/greybus/hid.c+1−2
@@ -12,8 +12,7 @@ · 11 unmodified lines
1212 #include <linux/module.h>
1313 #include <linux/mutex.h>
1414 #include <linux/slab.h>
15−
16−#include "greybus.h"
15+#include <linux/greybus.h>
1716
1817 /* Greybus HID device's structure */
1918 struct gb_hid {
drivers/staging/greybus/i2c.c+1−1
@@ -10,8 +10,8 @@ · 9 unmodified lines
1010 #include <linux/module.h>
1111 #include <linux/slab.h>
1212 #include <linux/i2c.h>
13+#include <linux/greybus.h>
1314
14−#include "greybus.h"
1515 #include "gbphy.h"
1616
1717 struct gb_i2c_device {
drivers/staging/greybus/interface.c+1−1
@@ -7,8 +7,8 @@ · 6 unmodified lines
77 */
88
99 #include <linux/delay.h>
10+#include <linux/greybus.h>
1011
11−#include "greybus.h"
1212 #include "greybus_trace.h"
1313
1414 #define GB_INTERFACE_MODE_SWITCH_TIMEOUT 2000
drivers/staging/greybus/light.c+1−3
@@ -11,11 +11,9 @@ · 10 unmodified lines
1111 #include <linux/led-class-flash.h>
1212 #include <linux/module.h>
1313 #include <linux/slab.h>
14+#include <linux/greybus.h>
1415 #include <media/v4l2-flash-led-class.h>
1516
16−#include "greybus.h"
17−#include "greybus_protocols.h"
18−
1917 #define NAMES_MAX 32
2018
2119 struct gb_channel {
drivers/staging/greybus/log.c+1−2
@@ -9,8 +9,7 @@ · 8 unmodified lines
99 #include <linux/slab.h>
1010 #include <linux/sizes.h>
1111 #include <linux/uaccess.h>
12−
13−#include "greybus.h"
12+#include <linux/greybus.h>
1413
1514 struct gb_log {
1615 struct gb_connection *connection;
drivers/staging/greybus/loopback.c+1−4
@@ -25,12 +25,9 @@ · 24 unmodified lines
2525 #include <linux/workqueue.h>
2626 #include <linux/atomic.h>
2727 #include <linux/pm_runtime.h>
28−
28+#include <linux/greybus.h>
2929 #include <asm/div64.h>
3030
31−#include "greybus.h"
32−#include "connection.h"
33−
3431 #define NSEC_PER_DAY 86400000000000ULL
3532
3633 struct gb_loopback_stats {
drivers/staging/greybus/manifest.c+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 * Copyright 2014-2015 Linaro Ltd.
77 */
88
9−#include "greybus.h"
9+#include <linux/greybus.h>
1010
1111 static const char *get_descriptor_type_string(u8 type)
1212 {
drivers/staging/greybus/module.c+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
66 * Copyright 2016 Linaro Ltd.
77 */
88
9−#include "greybus.h"
9+#include <linux/greybus.h>
1010 #include "greybus_trace.h"
1111
1212 static ssize_t eject_store(struct device *dev,
drivers/staging/greybus/operation.c+1−1
@@ -12,8 +12,8 @@ · 11 unmodified lines
1212 #include <linux/sched.h>
1313 #include <linux/wait.h>
1414 #include <linux/workqueue.h>
15+#include <linux/greybus.h>
1516
16−#include "greybus.h"
1717 #include "greybus_trace.h"
1818
1919 static struct kmem_cache *gb_operation_cache;
drivers/staging/greybus/power_supply.c+1−2
@@ -10,8 +10,7 @@ · 9 unmodified lines
1010 #include <linux/module.h>
1111 #include <linux/power_supply.h>
1212 #include <linux/slab.h>
13−
14−#include "greybus.h"
13+#include <linux/greybus.h>
1514
1615 #define PROP_MAX 32
1716
drivers/staging/greybus/pwm.c+1−1
@@ -10,8 +10,8 @@ · 9 unmodified lines
1010 #include <linux/module.h>
1111 #include <linux/slab.h>
1212 #include <linux/pwm.h>
13+#include <linux/greybus.h>
1314
14−#include "greybus.h"
1515 #include "gbphy.h"
1616
1717 struct gb_pwm_chip {
drivers/staging/greybus/raw.c+1−2
@@ -13,8 +13,7 @@ · 12 unmodified lines
1313 #include <linux/fs.h>
1414 #include <linux/idr.h>
1515 #include <linux/uaccess.h>
16−
17−#include "greybus.h"
16+#include <linux/greybus.h>
1817
1918 struct gb_raw {
2019 struct gb_connection *connection;
drivers/staging/greybus/sdio.c+1−1
@@ -12,8 +12,8 @@ · 11 unmodified lines
1212 #include <linux/mmc/mmc.h>
1313 #include <linux/scatterlist.h>
1414 #include <linux/workqueue.h>
15+#include <linux/greybus.h>
1516
16−#include "greybus.h"
1717 #include "gbphy.h"
1818
1919 struct gb_sdio_host {
drivers/staging/greybus/spi.c+1−1
@@ -7,8 +7,8 @@ · 6 unmodified lines
77 */
88
99 #include <linux/module.h>
10+#include <linux/greybus.h>
1011
11−#include "greybus.h"
1212 #include "gbphy.h"
1313 #include "spilib.h"
1414
drivers/staging/greybus/spilib.c+1−1
@@ -10,9 +10,9 @@ · 9 unmodified lines
1010 #include <linux/kernel.h>
1111 #include <linux/module.h>
1212 #include <linux/slab.h>
13+#include <linux/greybus.h>
1314 #include <linux/spi/spi.h>
1415
15−#include "greybus.h"
1616 #include "spilib.h"
1717
1818 struct gb_spilib {
drivers/staging/greybus/svc.c+1−2
@@ -8,8 +8,7 @@ · 7 unmodified lines
88
99 #include <linux/debugfs.h>
1010 #include <linux/workqueue.h>
11−
12−#include "greybus.h"
11+#include <linux/greybus.h>
1312
1413 #define SVC_INTF_EJECT_TIMEOUT 9000
1514 #define SVC_INTF_ACTIVATE_TIMEOUT 6000
drivers/staging/greybus/svc_watchdog.c+1−1
@@ -8,7 +8,7 @@ · 7 unmodified lines
88 #include <linux/delay.h>
99 #include <linux/suspend.h>
1010 #include <linux/workqueue.h>
11−#include "greybus.h"
11+#include <linux/greybus.h>
1212
1313 #define SVC_WATCHDOG_PERIOD (2 * HZ)
1414
drivers/staging/greybus/uart.c+1−1
@@ -28,8 +28,8 @@ · 27 unmodified lines
2828 #include <linux/kfifo.h>
2929 #include <linux/workqueue.h>
3030 #include <linux/completion.h>
31+#include <linux/greybus.h>
3132
32−#include "greybus.h"
3333 #include "gbphy.h"
3434
3535 #define GB_NUM_MINORS 16 /* 16 is more than enough */
drivers/staging/greybus/usb.c+1−1
@@ -10,8 +10,8 @@ · 9 unmodified lines
1010 #include <linux/slab.h>
1111 #include <linux/usb.h>
1212 #include <linux/usb/hcd.h>
13+#include <linux/greybus.h>
1314
14−#include "greybus.h"
1515 #include "gbphy.h"
1616
1717 /* Greybus USB request types */
drivers/staging/greybus/vibrator.c+1−2
@@ -13,8 +13,7 @@ · 12 unmodified lines
1313 #include <linux/kdev_t.h>
1414 #include <linux/idr.h>
1515 #include <linux/pm_runtime.h>
16−
17−#include "greybus.h"
16+#include <linux/greybus.h>
1817
1918 struct gb_vibrator_device {
2019 struct gb_connection *connection;
include/linux/greybus.hrenamed from drivers/staging/greybus/greybus.h+12−12
@@ -20,18 +20,18 @@ · 19 unmodified lines
2020 #include <linux/pm_runtime.h>
2121 #include <linux/idr.h>
2222
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>
3535
3636 /* Matches up with the Greybus Protocol specification document */
3737 #define GREYBUS_VERSION_MAJOR 0x00
include/linux/greybus/bundle.hrenamed from drivers/staging/greybus/bundle.h+0−0

File renamed without changes.

include/linux/greybus/connection.hrenamed from drivers/staging/greybus/connection.h+0−0

File renamed without changes.

include/linux/greybus/control.hrenamed from drivers/staging/greybus/control.h+0−0

File renamed without changes.

include/linux/greybus/greybus_id.hrenamed from drivers/staging/greybus/greybus_id.h+0−0

File renamed without changes.

include/linux/greybus/greybus_manifest.hrenamed from drivers/staging/greybus/greybus_manifest.h+0−0

File renamed without changes.

include/linux/greybus/greybus_protocols.hrenamed from drivers/staging/greybus/greybus_protocols.h+0−0

File renamed without changes.

include/linux/greybus/hd.hrenamed from drivers/staging/greybus/hd.h+0−0

File renamed without changes.

include/linux/greybus/interface.hrenamed from drivers/staging/greybus/interface.h+0−0

File renamed without changes.

include/linux/greybus/manifest.hrenamed from drivers/staging/greybus/manifest.h+0−0

File renamed without changes.

include/linux/greybus/module.hrenamed from drivers/staging/greybus/module.h+0−0

File renamed without changes.

include/linux/greybus/operation.hrenamed from drivers/staging/greybus/operation.h+0−0

File renamed without changes.

include/linux/greybus/svc.hrenamed from drivers/staging/greybus/svc.h+0−0

File renamed without changes.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t