From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 10 Mar 2015 21:03:01 +0000 (+0100)
Subject: Staging: sm750fb: fix hw_imageblit parameters
X-Git-Tag: v4.1-rc1~152^2~138^2~485
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7c6f3fdc488296ea00ded8024dcfd7de13d2ca67;p=karo-tx-linux.git

Staging: sm750fb: fix hw_imageblit parameters

Fix up hw_imageblit() so that the function paramaters match up with what
the driver expects them to be when using it as a function pointer.

Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Cc: Teddy Wang <teddy.wang@siliconmotion.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/sm750fb/sm750_accel.c b/drivers/staging/sm750fb/sm750_accel.c
index ee211deb9975..6521c3b3bcdc 100644
--- a/drivers/staging/sm750fb/sm750_accel.c
+++ b/drivers/staging/sm750fb/sm750_accel.c
@@ -395,21 +395,20 @@ static unsigned int deGetTransparency(struct lynx_accel * accel)
     return de_ctrl;
 }
 
-int hw_imageblit(
-struct lynx_accel * accel,
-unsigned char *pSrcbuf, /* pointer to start of source buffer in system memory */
-int srcDelta,          /* Pitch value (in bytes) of the source buffer, +ive means top down and -ive mean button up */
-unsigned int startBit, /* Mono data can start at any bit in a byte, this value should be 0 to 7 */
-unsigned int dBase,    /* Address of destination: offset in frame buffer */
-unsigned int dPitch,   /* Pitch value of destination surface in BYTE */
-unsigned int bytePerPixel,      /* Color depth of destination surface */
-unsigned int dx,
-unsigned int dy,       /* Starting coordinate of destination surface */
-unsigned int width,
-unsigned int height,   /* width and height of rectange in pixel value */
-unsigned int fColor,   /* Foreground color (corresponding to a 1 in the monochrome data */
-unsigned int bColor,   /* Background color (corresponding to a 0 in the monochrome data */
-unsigned int rop2)     /* ROP value */
+int hw_imageblit(struct lynx_accel *accel,
+		 const char *pSrcbuf, /* pointer to start of source buffer in system memory */
+		 u32 srcDelta,          /* Pitch value (in bytes) of the source buffer, +ive means top down and -ive mean button up */
+		 u32 startBit, /* Mono data can start at any bit in a byte, this value should be 0 to 7 */
+		 u32 dBase,    /* Address of destination: offset in frame buffer */
+		 u32 dPitch,   /* Pitch value of destination surface in BYTE */
+		 u32 bytePerPixel,      /* Color depth of destination surface */
+		 u32 dx,
+		 u32 dy,       /* Starting coordinate of destination surface */
+		 u32 width,
+		 u32 height,   /* width and height of rectange in pixel value */
+		 u32 fColor,   /* Foreground color (corresponding to a 1 in the monochrome data */
+		 u32 bColor,   /* Background color (corresponding to a 0 in the monochrome data */
+		 u32 rop2)     /* ROP value */
 {
     unsigned int ulBytesPerScan;
     unsigned int ul4BytesPerScan;
diff --git a/drivers/staging/sm750fb/sm750_accel.h b/drivers/staging/sm750fb/sm750_accel.h
index 575f4a7e38d4..3ee0bd89257b 100644
--- a/drivers/staging/sm750fb/sm750_accel.h
+++ b/drivers/staging/sm750fb/sm750_accel.h
@@ -258,19 +258,18 @@ unsigned int width,
 unsigned int height, /* width and height of rectangle in pixel value */
 unsigned int rop2);
 
-int hw_imageblit(
-struct lynx_accel * accel,
-unsigned char *pSrcbuf, /* pointer to start of source buffer in system memory */
-int srcDelta,          /* Pitch value (in bytes) of the source buffer, +ive means top down and -ive mean button up */
-unsigned int startBit, /* Mono data can start at any bit in a byte, this value should be 0 to 7 */
-unsigned int dBase,    /* Address of destination: offset in frame buffer */
-unsigned int dPitch,   /* Pitch value of destination surface in BYTE */
-unsigned int bytePerPixel,      /* Color depth of destination surface */
-unsigned int dx,
-unsigned int dy,       /* Starting coordinate of destination surface */
-unsigned int width,
-unsigned int height,   /* width and height of rectange in pixel value */
-unsigned int fColor,   /* Foreground color (corresponding to a 1 in the monochrome data */
-unsigned int bColor,   /* Background color (corresponding to a 0 in the monochrome data */
-unsigned int rop2);
+int hw_imageblit(struct lynx_accel *accel,
+		 const char *pSrcbuf, /* pointer to start of source buffer in system memory */
+		 u32 srcDelta,          /* Pitch value (in bytes) of the source buffer, +ive means top down and -ive mean button up */
+		 u32 startBit, /* Mono data can start at any bit in a byte, this value should be 0 to 7 */
+		 u32 dBase,    /* Address of destination: offset in frame buffer */
+		 u32 dPitch,   /* Pitch value of destination surface in BYTE */
+		 u32 bytePerPixel,      /* Color depth of destination surface */
+		 u32 dx,
+		 u32 dy,       /* Starting coordinate of destination surface */
+		 u32 width,
+		 u32 height,   /* width and height of rectange in pixel value */
+		 u32 fColor,   /* Foreground color (corresponding to a 1 in the monochrome data */
+		 u32 bColor,   /* Background color (corresponding to a 0 in the monochrome data */
+		 u32 rop2);
 #endif