From patchwork Fri Mar 20 15:22:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Stoakes X-Patchwork-Id: 6057671 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 89018BF90F for ; Fri, 20 Mar 2015 15:23:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 931B7204D5 for ; Fri, 20 Mar 2015 15:23:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8996420120 for ; Fri, 20 Mar 2015 15:23:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751539AbbCTPXB (ORCPT ); Fri, 20 Mar 2015 11:23:01 -0400 Received: from mail-we0-f182.google.com ([74.125.82.182]:33267 "EHLO mail-we0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752158AbbCTPWm (ORCPT ); Fri, 20 Mar 2015 11:22:42 -0400 Received: by weop45 with SMTP id p45so84760848weo.0; Fri, 20 Mar 2015 08:22:41 -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=ALs/FbJ5z7eDxz/Q5dyhin5JqBdcw4crnSFXFWnJ0J0=; b=sUScE/ev1mitf56JpVfT0t2e7Oau2Zvn8k/FuUzvFG24k7lptI97bPuKXgpWDP63Zl RzS1hlqSmY6gr+eeL6QhXG6kOen5XNQR+c3X70ZxkStgGCz9Sxuu6FQpS8flGU/XOBEp NVeYmDw+/MndnUWokdOkPAhOB0m+c+r6hBWPHVQAKwezm4sgkV8iWa0YWDy28pslQVkz N06h1hK8CDvOLjNNO97COirVwrXpf7up61R3+ZKNlfhEDhd4M4yCJlU6FnTIuchYrwgJ XNpv0b0frXzuAQMRQQZo14DKBjoHr0ZCn6RNiMwQSMEViBzIRfAMBAbPXRGhlIKOHACq C81w== X-Received: by 10.180.89.34 with SMTP id bl2mr6167910wib.23.1426864961422; Fri, 20 Mar 2015 08:22:41 -0700 (PDT) Received: from localhost (cpc71925-newt30-2-0-cust4.19-3.cable.virginm.net. [82.35.188.5]) by mx.google.com with ESMTPSA id md2sm3417994wic.19.2015.03.20.08.22.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Mar 2015 08:22:40 -0700 (PDT) From: Lorenzo Stoakes To: sudipm.mukherjee@gmail.com, teddy.wang@siliconmotion.com, gregkh@linuxfoundation.org Cc: linux-fbdev@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Lorenzo Stoakes Subject: [PATCH RESEND 2 5/5] staging: sm750fb: Remove spinlock helper function Date: Fri, 20 Mar 2015 15:22:15 +0000 Message-Id: <1426864935-29350-5-git-send-email-lstoakes@gmail.com> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1426864935-29350-1-git-send-email-lstoakes@gmail.com> References: <1426864935-29350-1-git-send-email-lstoakes@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=unavailable 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 This patch removes the unnecessary spinlock helper function and instead calls spin_lock and spin_unlock directly. This does *not* resolve sparse warnings about context imbalances but these are spurious. Signed-off-by: Lorenzo Stoakes --- drivers/staging/sm750fb/sm750.c | 53 +++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 23 deletions(-) -- 2.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c index be35429..a6658e1 100644 --- a/drivers/staging/sm750fb/sm750.c +++ b/drivers/staging/sm750fb/sm750.c @@ -56,23 +56,6 @@ static char * g_settings = NULL; static int g_dualview; static char * g_option = NULL; -/* if not use spin_lock,system will die if user load driver - * and immediatly unload driver frequently (dual)*/ -static inline void myspin_lock(spinlock_t * sl){ - struct lynx_share * share; - share = container_of(sl,struct lynx_share,slock); - if(share->dual){ - spin_lock(sl); - } -} - -static inline void myspin_unlock(spinlock_t * sl){ - struct lynx_share * share; - share = container_of(sl,struct lynx_share,slock); - if(share->dual){ - spin_unlock(sl); - } -} static const struct fb_videomode lynx750_ext[] = { /* 1024x600-60 VESA [1.71:1] */ {NULL, 60, 1024, 600, 20423, 144, 40, 18, 1, 104, 3, @@ -209,13 +192,21 @@ static void lynxfb_ops_fillrect(struct fb_info* info,const struct fb_fillrect* r color = (Bpp == 1)?region->color:((u32*)info->pseudo_palette)[region->color]; rop = ( region->rop != ROP_COPY ) ? HW_ROP2_XOR:HW_ROP2_COPY; - myspin_lock(&share->slock); + /* + * If not use spin_lock,system will die if user load driver + * and immediatly unload driver frequently (dual) + */ + if (share->dual) + spin_lock(&share->slock); + share->accel.de_fillrect(&share->accel, base,pitch,Bpp, region->dx,region->dy, region->width,region->height, color,rop); - myspin_unlock(&share->slock); + + if (share->dual) + spin_unlock(&share->slock); } static void lynxfb_ops_copyarea(struct fb_info * info,const struct fb_copyarea * region) @@ -233,12 +224,20 @@ static void lynxfb_ops_copyarea(struct fb_info * info,const struct fb_copyarea * pitch = info->fix.line_length; Bpp = info->var.bits_per_pixel >> 3; - myspin_lock(&share->slock); + /* + * If not use spin_lock, system will die if user load driver + * and immediatly unload driver frequently (dual) + */ + if (share->dual) + spin_lock(&share->slock); + share->accel.de_copyarea(&share->accel, base,pitch,region->sx,region->sy, base,pitch,Bpp,region->dx,region->dy, region->width,region->height,HW_ROP2_COPY); - myspin_unlock(&share->slock); + + if (share->dual) + spin_unlock(&share->slock); } static void lynxfb_ops_imageblit(struct fb_info*info,const struct fb_image* image) @@ -272,14 +271,22 @@ static void lynxfb_ops_imageblit(struct fb_info*info,const struct fb_image* imag } return; _do_work: - myspin_lock(&share->slock); + /* + * If not use spin_lock, system will die if user load driver + * and immediatly unload driver frequently (dual) + */ + if (share->dual) + spin_lock(&share->slock); + share->accel.de_imageblit(&share->accel, image->data,image->width>>3,0, base,pitch,Bpp, image->dx,image->dy, image->width,image->height, fgcol,bgcol,HW_ROP2_COPY); - myspin_unlock(&share->slock); + + if (share->dual) + spin_unlock(&share->slock); } static int lynxfb_ops_pan_display(struct fb_var_screeninfo *var,