diff options
author | Olof Johansson | 2019-06-17 14:11:53 +0200 |
---|---|---|
committer | Olof Johansson | 2019-06-17 14:11:53 +0200 |
commit | 449c1cd29777c5d6bf29647871bef6b93d60bb0b (patch) | |
tree | dcb27ee05207a341f3a486e7153c20fa47a00d9b /include/linux/platform_data | |
parent | Merge tag 'armsoc-drop-netx-v5.3' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | ARM: versatile: Drop CLCD platform data (diff) | |
download | kernel-qcow2-linux-449c1cd29777c5d6bf29647871bef6b93d60bb0b.tar.gz kernel-qcow2-linux-449c1cd29777c5d6bf29647871bef6b93d60bb0b.tar.xz kernel-qcow2-linux-449c1cd29777c5d6bf29647871bef6b93d60bb0b.zip |
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 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef PLAT_CLCD_H -#define PLAT_CLCD_H - -#ifdef CONFIG_PLAT_VERSATILE_CLCD -struct clcd_panel *versatile_clcd_get_panel(const char *); -int versatile_clcd_setup_dma(struct clcd_fb *, unsigned long); -int versatile_clcd_mmap_dma(struct clcd_fb *, struct vm_area_struct *); -void versatile_clcd_remove_dma(struct clcd_fb *); -#else -static inline struct clcd_panel *versatile_clcd_get_panel(const char *s) -{ - return NULL; -} -static inline int versatile_clcd_setup_dma(struct clcd_fb *fb, unsigned long framesize) -{ - return -ENODEV; -} -static inline int versatile_clcd_mmap_dma(struct clcd_fb *fb, struct vm_area_struct *vm) -{ - return -ENODEV; -} -static inline void versatile_clcd_remove_dma(struct clcd_fb *fb) -{ -} -#endif - -#endif |