fbdev: c2p - Rename c2p to c2p_planar

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 4fc29eae515250d2277d6e8884abf9caf39274c5..be2b657546efe3d96e2403476c8c896d774959e4 100644 (file)
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -28,7 +28,7 @@ obj-$(CONFIG_FB_DDC)           += fb_ddc.o
 obj-$(CONFIG_FB_DEFERRED_IO)   += fb_defio.o
 
 # Hardware specific drivers go first
-obj-$(CONFIG_FB_AMIGA)            += amifb.o c2p.o
+obj-$(CONFIG_FB_AMIGA)            += amifb.o c2p_planar.o
 obj-$(CONFIG_FB_ARC)              += arcfb.o
 obj-$(CONFIG_FB_CLPS711X)         += clps711xfb.o
 obj-$(CONFIG_FB_CYBER2000)        += cyber2000fb.o

diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index b8e9a8682f2de98011502b762062285febbd6552..100f236614650f42337d7007adb5f32cf09ebf77 100644 (file)
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -2159,9 +2159,9 @@ static void amifb_imageblit(struct fb_info *info, const struct fb_image *image)
                        src += pitch;
                }
        } else {
-               c2p(info->screen_base, image->data, dx, dy, width, height,
-                   par->next_line, par->next_plane, image->width,
-                   info->var.bits_per_pixel);
+               c2p_planar(info->screen_base, image->data, dx, dy, width,
+                          height, par->next_line, par->next_plane,
+                          image->width, info->var.bits_per_pixel);
        }
 }
 

diff --git a/drivers/video/c2p.h b/drivers/video/c2p.h
index 53641298b92435e09f1c767774fd2c020af7ee27..6c38d40427d8d8da12cc084705fb76f80a652b8d 100644 (file)
--- a/drivers/video/c2p.h
+++ b/drivers/video/c2p.h
@@ -10,9 +10,9 @@
 
 #include <linux/types.h>
 
-extern void c2p(void *dst, const void *src, u32 dx, u32 dy, u32 width,
-               u32 height, u32 dst_nextline, u32 dst_nextplane,
-               u32 src_nextline, u32 bpp);
+extern void c2p_planar(void *dst, const void *src, u32 dx, u32 dy, u32 width,
+                      u32 height, u32 dst_nextline, u32 dst_nextplane,
+                      u32 src_nextline, u32 bpp);
 
 extern void c2p_iplan2(void *dst, const void *src, u32 dx, u32 dy, u32 width,
                       u32 height, u32 dst_nextline, u32 src_nextline,

diff --git a/drivers/video/c2p.c b/drivers/video/c2p_planar.c
similarity index 93%
rename from drivers/video/c2p.c
rename to drivers/video/c2p_planar.c
index 1238c8b912ead5ce9042055cf707638a9877ab03..ec7ac8526f060b8c4cc6cad632b5dd673b2fd3e8 100644 (file)
--- a/drivers/video/c2p.c
+++ b/drivers/video/c2p_planar.c
@@ -71,7 +71,7 @@ static inline void store_planar_masked(void *dst, u32 dst_inc, u32 bpp,
 
 
     /*
-     *  c2p - Copy 8-bit chunky image data to a planar frame buffer
+     *  c2p_planar - Copy 8-bit chunky image data to a planar frame buffer
      *  @dst: Starting address of the planar frame buffer
      *  @dx: Horizontal destination offset (in pixels)
      *  @dy: Vertical destination offset (in pixels)
@@ -83,8 +83,9 @@ static inline void store_planar_masked(void *dst, u32 dst_inc, u32 bpp,
      *  @bpp: Bits per pixel of the planar frame buffer (1-8)
      */
 
-void c2p(void *dst, const void *src, u32 dx, u32 dy, u32 width, u32 height,
-        u32 dst_nextline, u32 dst_nextplane, u32 src_nextline, u32 bpp)
+void c2p_planar(void *dst, const void *src, u32 dx, u32 dy, u32 width,
+               u32 height, u32 dst_nextline, u32 dst_nextplane,
+               u32 src_nextline, u32 bpp)
 {
        union {
                u8 pixels[32];
@@ -150,6 +151,6 @@ void c2p(void *dst, const void *src, u32 dx, u32 dy, u32 width, u32 height,
                dst += dst_nextline;
        }
 }
-EXPORT_SYMBOL_GPL(c2p);
+EXPORT_SYMBOL_GPL(c2p_planar);
 
 MODULE_LICENSE("GPL");