fbdev: sh_mobile_meram: Add _cfg suffix to struct sh_mobile_meram_icb

The structure describe ICB configuration, no ICB objects themselves.
Rename it to sh_mobile_meram_icb_cfg in preparation for the addition of
an ICB structure.

All the structure fields are unsigned integers, make them so.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

diff --git a/drivers/video/sh_mobile_meram.c b/drivers/video/sh_mobile_meram.c
index dbf5c43852bb62a238663d5fd794eebbfea5715e..2ad5a454fa2e6e6bc5187291f703d70ca4d79eac 100644 (file)
--- a/drivers/video/sh_mobile_meram.c
+++ b/drivers/video/sh_mobile_meram.c
@@ -156,7 +156,7 @@ static inline unsigned long meram_read_reg(void __iomem *base, int off)
  */
 
 static inline int meram_check_overlap(struct sh_mobile_meram_priv *priv,
-                                     struct sh_mobile_meram_icb *new)
+                                     struct sh_mobile_meram_icb_cfg *new)
 {
        int i;
        int used_start, used_end, meram_start, meram_end;
@@ -188,7 +188,7 @@ static inline int meram_check_overlap(struct sh_mobile_meram_priv *priv,
  */
 
 static inline void meram_mark(struct sh_mobile_meram_priv *priv,
-                             struct sh_mobile_meram_icb *new)
+                             struct sh_mobile_meram_icb_cfg *new)
 {
        int n;
 
@@ -211,7 +211,7 @@ static inline void meram_mark(struct sh_mobile_meram_priv *priv,
  */
 
 static inline void meram_unmark(struct sh_mobile_meram_priv *priv,
-                               struct sh_mobile_meram_icb *icb)
+                               struct sh_mobile_meram_icb_cfg *icb)
 {
        int i;
        unsigned long pattern;
@@ -303,7 +303,7 @@ static inline void meram_get_next_icb_addr(struct sh_mobile_meram_info *pdata,
  */
 
 static int meram_init(struct sh_mobile_meram_priv *priv,
-                     struct sh_mobile_meram_icb *icb,
+                     struct sh_mobile_meram_icb_cfg *icb,
                      int xres, int yres, int *out_pitch)
 {
        unsigned long total_byte_count = MERAM_CALC_BYTECOUNT(xres, yres);
@@ -370,7 +370,7 @@ static int meram_init(struct sh_mobile_meram_priv *priv,
 }
 
 static void meram_deinit(struct sh_mobile_meram_priv *priv,
-                       struct sh_mobile_meram_icb *icb)
+                        struct sh_mobile_meram_icb_cfg *icb)
 {
        /* disable ICB */
        meram_write_icb(priv->base, icb->cache_icb,  MExxCTL,

diff --git a/include/video/sh_mobile_meram.h b/include/video/sh_mobile_meram.h
index af602d602b287aaa6681e0a02667e9857cec19b4..caae558d52aef4b6b6ea4d51e1027b3826b45e3c 100644 (file)
--- a/include/video/sh_mobile_meram.h
+++ b/include/video/sh_mobile_meram.h
@@ -25,17 +25,17 @@ struct sh_mobile_meram_info {
 };
 
 /* icb config */
-struct sh_mobile_meram_icb {
-       int marker_icb;         /* ICB # for Marker ICB */
-       int cache_icb;          /* ICB # for Cache ICB */
-       int meram_offset;       /* MERAM Buffer Offset to use */
-       int meram_size;         /* MERAM Buffer Size to use */
+struct sh_mobile_meram_icb_cfg {
+       unsigned int marker_icb;        /* ICB # for Marker ICB */
+       unsigned int cache_icb;         /* ICB # for Cache ICB */
+       unsigned int meram_offset;      /* MERAM Buffer Offset to use */
+       unsigned int meram_size;        /* MERAM Buffer Size to use */
 
-       int cache_unit;         /* bytes to cache per ICB */
+       unsigned int cache_unit;        /* bytes to cache per ICB */
 };
 
 struct sh_mobile_meram_cfg {
-       struct sh_mobile_meram_icb      icb[2];
+       struct sh_mobile_meram_icb_cfg  icb[2];
        int                             pixelformat;
        int                             current_reg;
 };