sh_mobile_meram: Use direct function calls for the public API

There's no reason to use abstract operation pointers to implement the
MERAM API. Replace them by direct function calls.

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

1 files changed, 35 insertions, 15 deletions

diff --git a/include/video/sh_mobile_meram.h b/include/video/sh_mobile_meram.h
index 8a5afaf2c6dc..11348379f093 100644
--- a/include/video/sh_mobile_meram.h
+++ b/include/video/sh_mobile_meram.h
@@ -15,7 +15,6 @@ enum {
 
 
 struct sh_mobile_meram_priv;
-struct sh_mobile_meram_ops;
 
 /*
  * struct sh_mobile_meram_info - MERAM platform data
@@ -24,7 +23,6 @@ struct sh_mobile_meram_ops;
 struct sh_mobile_meram_info {
         int                             addr_mode;
         u32                             reserved_icbs;
-        struct sh_mobile_meram_ops      *ops;
         struct sh_mobile_meram_priv     *priv;
         struct platform_device          *pdev;
 };
@@ -38,21 +36,43 @@ struct sh_mobile_meram_cfg {
         struct sh_mobile_meram_icb_cfg icb[2];
 };
 
-struct module;
-struct sh_mobile_meram_ops {
-        struct module   *module;
-
-        /* LCDC cache management */
-        void *(*cache_alloc)(struct sh_mobile_meram_info *meram_dev,
-                             const struct sh_mobile_meram_cfg *cfg,
-                             unsigned int xres, unsigned int yres,
-                             unsigned int pixelformat, unsigned int *pitch);
-        void (*cache_free)(struct sh_mobile_meram_info *meram_dev, void *data);
-        void (*cache_update)(struct sh_mobile_meram_info *meram_dev, void *data,
+#if defined(CONFIG_FB_SH_MOBILE_MERAM) || \
+    defined(CONFIG_FB_SH_MOBILE_MERAM_MODULE)
+void *sh_mobile_meram_cache_alloc(struct sh_mobile_meram_info *dev,
+                                  const struct sh_mobile_meram_cfg *cfg,
+                                  unsigned int xres, unsigned int yres,
+                                  unsigned int pixelformat,
+                                  unsigned int *pitch);
+void sh_mobile_meram_cache_free(struct sh_mobile_meram_info *dev, void *data);
+void sh_mobile_meram_cache_update(struct sh_mobile_meram_info *dev, void *data,
+                                  unsigned long base_addr_y,
+                                  unsigned long base_addr_c,
+                                  unsigned long *icb_addr_y,
+                                  unsigned long *icb_addr_c);
+#else
+static inline void *
+sh_mobile_meram_cache_alloc(struct sh_mobile_meram_info *dev,
+                            const struct sh_mobile_meram_cfg *cfg,
+                            unsigned int xres, unsigned int yres,
+                            unsigned int pixelformat,
+                            unsigned int *pitch)
+{
+        return ERR_PTR(-ENODEV);
+}
+
+static inline void
+sh_mobile_meram_cache_free(struct sh_mobile_meram_info *dev, void *data)
+{
+}
+
+static inline void
+sh_mobile_meram_cache_update(struct sh_mobile_meram_info *dev, void *data,
                              unsigned long base_addr_y,
                              unsigned long base_addr_c,
                              unsigned long *icb_addr_y,
-                             unsigned long *icb_addr_c);
-};
+                             unsigned long *icb_addr_c)
+{
+}
+#endif
 
 #endif /* __VIDEO_SH_MOBILE_MERAM_H__  */