diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-07-13 12:13:47 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-08-19 08:22:45 +0200 |
| commit | 8a20974f0370fe1b924704399e7ba327d894ef72 (patch) | |
| tree | f06a04d8807beed632131f0437e050ae3b052ec2 /drivers/video | |
| parent | d86d29df57adf9258f56939e59cdd70932845885 (diff) | |
| download | linux-stable-8a20974f0370fe1b924704399e7ba327d894ef72.tar.gz linux-stable-8a20974f0370fe1b924704399e7ba327d894ef72.tar.bz2 linux-stable-8a20974f0370fe1b924704399e7ba327d894ef72.zip | |
fbdev: sh_mobile_meram: Remove unneeded sh_mobile_meram.h
The drivers/video/sh_mobile_meram.h header contains unused definitions
and declarations. Move the only used macro to sh_mobile_meram.c, and
remove the header.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/sh_mobile_lcdcfb.c | 2 | ||||
| -rw-r--r-- | drivers/video/sh_mobile_meram.c | 5 | ||||
| -rw-r--r-- | drivers/video/sh_mobile_meram.h | 33 |
3 files changed, 4 insertions, 36 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index 0b7b49265a1a..088cb17857e3 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c @@ -24,10 +24,10 @@ #include <linux/backlight.h> #include <linux/gpio.h> #include <video/sh_mobile_lcdc.h> +#include <video/sh_mobile_meram.h> #include <linux/atomic.h> #include "sh_mobile_lcdcfb.h" -#include "sh_mobile_meram.h" #define SIDE_B_OFFSET 0x1000 #define MIRROR_OFFSET 0x2000 diff --git a/drivers/video/sh_mobile_meram.c b/drivers/video/sh_mobile_meram.c index 7ba6dce459b2..f63297099193 100644 --- a/drivers/video/sh_mobile_meram.c +++ b/drivers/video/sh_mobile_meram.c @@ -16,8 +16,7 @@ #include <linux/io.h> #include <linux/slab.h> #include <linux/platform_device.h> - -#include "sh_mobile_meram.h" +#include <video/sh_mobile_meram.h> /* meram registers */ #define MEVCR1 0x4 @@ -82,6 +81,8 @@ ((yszm1) << MExxBSIZE_YSZM1_SHIFT) | \ ((xszm1) << MExxBSIZE_XSZM1_SHIFT)) +#define SH_MOBILE_MERAM_ICB_NUM 32 + static unsigned long common_regs[] = { MEVCR1, MEQSEL1, diff --git a/drivers/video/sh_mobile_meram.h b/drivers/video/sh_mobile_meram.h deleted file mode 100644 index 1615204b14de..000000000000 --- a/drivers/video/sh_mobile_meram.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef __sh_mobile_meram_h__ -#define __sh_mobile_meram_h__ - -#include <linux/mutex.h> -#include <video/sh_mobile_meram.h> - -/* - * MERAM private - */ - -#define MERAM_ICB_Y 0x1 -#define MERAM_ICB_C 0x2 - -/* MERAM cache size */ -#define SH_MOBILE_MERAM_ICB_NUM 32 - -#define SH_MOBILE_MERAM_CACHE_OFFSET(p) ((p) >> 16) -#define SH_MOBILE_MERAM_CACHE_SIZE(p) ((p) & 0xffff) - -int sh_mobile_meram_alloc_icb(const struct sh_mobile_meram_cfg *cfg, - int xres, - int yres, - unsigned int base_addr, - int yuv_mode, - int *marker_icb, - int *out_pitch); - -void sh_mobile_meram_free_icb(int marker_icb); - -#define SH_MOBILE_MERAM_START(ind, ab) \ - (0xC0000000 | ((ab & 0x1) << 23) | ((ind & 0x1F) << 24)) - -#endif /* !__sh_mobile_meram_h__ */ |