From patchwork Tue Mar 10 17:16:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudip Mukherjee X-Patchwork-Id: 5979581 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9BBBD9F399 for ; Tue, 10 Mar 2015 17:18:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A02F320220 for ; Tue, 10 Mar 2015 17:18:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B9D9320109 for ; Tue, 10 Mar 2015 17:18:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753527AbbCJRSW (ORCPT ); Tue, 10 Mar 2015 13:18:22 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:38758 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752183AbbCJRRV (ORCPT ); Tue, 10 Mar 2015 13:17:21 -0400 Received: by pabrd3 with SMTP id rd3so3855767pab.5; Tue, 10 Mar 2015 10:17:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=v2pvv4wQm+6z0xN30vZibl6WI/eXz+MzF7O8P3XKbdw=; b=vLFTDnGrpfLwHDWO0XKp8nw/3luOx2QmDIL/uQ8c4B0dbK9LF9ckAyrToVnTkVoQcy /q2gud8ubxmr/LIOpwKIDAw/uTL1y2rxkndToqEWqxUWEgwdXtwy4CuS2LS0F0RurCay q2ZxE9qbatExiHHezf58YH7boNuxvExRVKnJs5NhQywwCZq3+Pr/eQgaq605dBde/unc ki5FDIqIoGPMecbfTTcYGRVp2OTKYVGK9M8ymsIUXJl9pZjyM1tSekeaLv3sW9C5vzYW hSIUkLpeEbcnbHkdLh2urEqRx6gK81hbnBzqmw7qvCuBln+HPSXp+g53ZRHB+xdFRBhG H3ww== X-Received: by 10.66.241.8 with SMTP id we8mr68468526pac.44.1426007841100; Tue, 10 Mar 2015 10:17:21 -0700 (PDT) Received: from localhost.localdomain ([122.169.145.94]) by mx.google.com with ESMTPSA id kd9sm2087506pab.0.2015.03.10.10.17.18 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Mar 2015 10:17:20 -0700 (PDT) From: Sudip Mukherjee To: Greg Kroah-Hartman Cc: linux-fbdev@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Sudip Mukherjee Subject: [PATCH 4/6] staging: sm750fb: correct incompatible pointer type Date: Tue, 10 Mar 2015 22:46:55 +0530 Message-Id: <1426007817-1884-5-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1426007817-1884-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1426007817-1884-1-git-send-email-sudipm.mukherjee@gmail.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP we were getting build warnings about assignment of incompatible pointer types. some of the function definitions were having wrong return type or arguments. Signed-off-by: Sudip Mukherjee --- drivers/staging/sm750fb/sm750.h | 11 ++++++----- drivers/staging/sm750fb/sm750_accel.c | 4 ++-- drivers/staging/sm750fb/sm750_accel.h | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h index d39968c..edb955a 100644 --- a/drivers/staging/sm750fb/sm750.h +++ b/drivers/staging/sm750fb/sm750.h @@ -23,7 +23,7 @@ struct lynx_accel{ volatile unsigned char __iomem * dpPortBase; /* function fointers */ - int (*de_init)(struct lynx_accel *); + void (*de_init)(struct lynx_accel *); int (*de_wait)(void);/* see if hardware ready to work */ @@ -34,8 +34,8 @@ struct lynx_accel{ u32,u32,u32,u32, u32,u32,u32,u32); - int (*de_imageblit)(struct lynx_accel *,const char *,u32,u32,u32, - u32,u32,u32,u32,u32,u32,u32,u32,u32); + int (*de_imageblit)(struct lynx_accel *, const char *, u32, u32, u32, + u32, u32, u32, u32, u32, u32, u32, u32, u32); }; @@ -120,8 +120,9 @@ struct lynxfb_crtc{ int(*proc_setColReg)(struct lynxfb_crtc*,ushort,ushort,ushort,ushort); void (*clear)(struct lynxfb_crtc*); /* pan display */ - int(*proc_panDisplay)(struct lynxfb_crtc*, struct fb_var_screeninfo*, - struct fb_info*); + int (*proc_panDisplay)(struct lynxfb_crtc*, + const struct fb_var_screeninfo*, + const struct fb_info*); /* cursor information */ struct lynx_cursor cursor; }; diff --git a/drivers/staging/sm750fb/sm750_accel.c b/drivers/staging/sm750fb/sm750_accel.c index ee211de..421adef 100644 --- a/drivers/staging/sm750fb/sm750_accel.c +++ b/drivers/staging/sm750fb/sm750_accel.c @@ -397,8 +397,8 @@ static unsigned int deGetTransparency(struct lynx_accel * accel) 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 */ +const char *pSrcbuf, /* pointer to start of source buffer in system memory */ +unsigned 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 */ diff --git a/drivers/staging/sm750fb/sm750_accel.h b/drivers/staging/sm750fb/sm750_accel.h index 575f4a7..9c16618 100644 --- a/drivers/staging/sm750fb/sm750_accel.h +++ b/drivers/staging/sm750fb/sm750_accel.h @@ -260,8 +260,8 @@ 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 */ +const char *pSrcbuf, /* pointer to start of source buffer in system memory */ +unsigned 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 */