fbdev: sh_mobile_meram: Add struct sh_mobile_meram_icb

The new structure stores ICB parameters for ICBs.

Instead of modifying the struct sh_mobile_meram_cfg instances passed by
callers, store the ICB parameters internally and make the public API
take const pointers to sh_mobile_meram_cfg.

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

1 files changed, 4 insertions, 8 deletions

diff --git a/include/video/sh_mobile_meram.h b/include/video/sh_mobile_meram.h
index 6755e3f89a36..05ca3f92de10 100644
--- a/include/video/sh_mobile_meram.h
+++ b/include/video/sh_mobile_meram.h
@@ -30,14 +30,10 @@ struct sh_mobile_meram_icb_cfg {
         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 */
-
-        unsigned int cache_unit;        /* bytes to cache per ICB */
 };
 
 struct sh_mobile_meram_cfg {
-        struct sh_mobile_meram_icb_cfg  icb[2];
-        int                             pixelformat;
-        int                             current_reg;
+        struct sh_mobile_meram_icb_cfg icb[2];
 };
 
 struct module;
@@ -45,7 +41,7 @@ struct sh_mobile_meram_ops {
         struct module   *module;
         /* register usage of meram */
         int (*meram_register)(struct sh_mobile_meram_info *meram_dev,
-                              struct sh_mobile_meram_cfg *cfg,
+                              const struct sh_mobile_meram_cfg *cfg,
                               unsigned int xres, unsigned int yres,
                               unsigned int pixelformat,
                               unsigned long base_addr_y,
@@ -56,11 +52,11 @@ struct sh_mobile_meram_ops {
 
         /* unregister usage of meram */
         int (*meram_unregister)(struct sh_mobile_meram_info *meram_dev,
-                                struct sh_mobile_meram_cfg *cfg);
+                                const struct sh_mobile_meram_cfg *cfg);
 
         /* update meram settings */
         int (*meram_update)(struct sh_mobile_meram_info *meram_dev,
-                            struct sh_mobile_meram_cfg *cfg,
+                            const struct sh_mobile_meram_cfg *cfg,
                             unsigned long base_addr_y,
                             unsigned long base_addr_c,
                             unsigned long *icb_addr_y,