diff options
| author | Olof Johansson <olof@lixom.net> | 2019-06-17 08:11:53 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-06-17 08:11:53 -0400 |
| commit | 449c1cd29777c5d6bf29647871bef6b93d60bb0b (patch) | |
| tree | dcb27ee05207a341f3a486e7153c20fa47a00d9b /include/linux/platform_data | |
| parent | 6ad135992e661e205579b5eadfb4c099da138a01 (diff) | |
| parent | 153969fd952d81ab8f57574f9be1a90b0a0fa791 (diff) | |
Merge tag 'versatile-v5.3-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into arm/soc
Versatile platform updates for the v5.3 kernel cycle:
- Drop a slew of unused CLCD platform data
- Fix OF reference counts
* tag 'versatile-v5.3-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: versatile: Drop CLCD platform data
ARM: versatile: fix a leaked reference by addingmissing of_node_put
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/video-clcd-versatile.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/include/linux/platform_data/video-clcd-versatile.h b/include/linux/platform_data/video-clcd-versatile.h deleted file mode 100644 index 305ebaec3afd..000000000000 --- a/include/linux/platform_data/video-clcd-versatile.h +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
| 2 | #ifndef PLAT_CLCD_H | ||
| 3 | #define PLAT_CLCD_H | ||
| 4 | |||
| 5 | #ifdef CONFIG_PLAT_VERSATILE_CLCD | ||
| 6 | struct clcd_panel *versatile_clcd_get_panel(const char *); | ||
| 7 | int versatile_clcd_setup_dma(struct clcd_fb *, unsigned long); | ||
| 8 | int versatile_clcd_mmap_dma(struct clcd_fb *, struct vm_area_struct *); | ||
| 9 | void versatile_clcd_remove_dma(struct clcd_fb *); | ||
| 10 | #else | ||
| 11 | static inline struct clcd_panel *versatile_clcd_get_panel(const char *s) | ||
| 12 | { | ||
| 13 | return NULL; | ||
| 14 | } | ||
| 15 | static inline int versatile_clcd_setup_dma(struct clcd_fb *fb, unsigned long framesize) | ||
| 16 | { | ||
| 17 | return -ENODEV; | ||
| 18 | } | ||
| 19 | static inline int versatile_clcd_mmap_dma(struct clcd_fb *fb, struct vm_area_struct *vm) | ||
| 20 | { | ||
| 21 | return -ENODEV; | ||
| 22 | } | ||
| 23 | static inline void versatile_clcd_remove_dma(struct clcd_fb *fb) | ||
| 24 | { | ||
| 25 | } | ||
| 26 | #endif | ||
| 27 | |||
| 28 | #endif | ||
