From patchwork Mon Dec 20 13:03:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Charkov X-Patchwork-Id: 420651 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBKD3ISs011620 for ; Mon, 20 Dec 2010 13:03:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752775Ab0LTNDS (ORCPT ); Mon, 20 Dec 2010 08:03:18 -0500 Received: from mail-ew0-f45.google.com ([209.85.215.45]:60893 "EHLO mail-ew0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751969Ab0LTNDR (ORCPT ); Mon, 20 Dec 2010 08:03:17 -0500 Received: by ewy10 with SMTP id 10so1384764ewy.4 for ; Mon, 20 Dec 2010 05:03:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=/RKHpyysz/U/10/JWfWKat9s9SNELsaR071me1WaHXA=; b=MkSoZ4Rs3VsA+BAD9ShEYKLTeoBuG3MXIiYuwzmeyhV5XkhTACENjtycacAX6w4VSJ WjjljlBvYR8/2opzvhCEK4vxXhY6bX3vQ/E2/1kBKolZbElfL+tYXYPKR5yJuf+x9t6e kgwsmIuXNFl9TASflYySKxzU0ISKxeFWZF/3Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=r/d4Ctw0623PyyEA2Uk/W8j4Xa0mZwjGAfQOPWiqnOBQA+byyz3M6kJD31Sho9HxZX 3ZuDkZEvT6xatyOpuDvvE8RY4nDACi0nT4Rmzf/T5w0+VmfEDnPU33y/Ur3FrPoX0zar 86cTyM91oEprrv43PbOT+rNUWO7x/N1WhjsRw= Received: by 10.213.15.78 with SMTP id j14mr3794410eba.60.1292850195797; Mon, 20 Dec 2010 05:03:15 -0800 (PST) Received: from localhost ([109.188.13.241]) by mx.google.com with ESMTPS id b52sm2847817eei.1.2010.12.20.05.03.13 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 20 Dec 2010 05:03:15 -0800 (PST) Date: Mon, 20 Dec 2010 16:03:14 +0300 From: Alexey Charkov To: "Janorkar, Mayuresh" Cc: Alexey Charkov , Paul Mundt , "linux-fbdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "vt8500-wm8505-linux-kernel@googlegroups.com" Subject: [PATCH 1/2] fbdev: Minor cleanup in WM8505-related code Message-ID: <20101220130314.GA3627@alchark-u3s> References: <20101219181300.GA32645@alchark-u3s> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 20 Dec 2010 13:03:19 +0000 (UTC) diff --git a/drivers/video/wm8505fb.c b/drivers/video/wm8505fb.c index e37251b..9ca9dbb 100644 --- a/drivers/video/wm8505fb.c +++ b/drivers/video/wm8505fb.c @@ -291,7 +291,7 @@ static int __devinit wm8505fb_probe(struct platform_device *pdev) goto failed_fbi; } - res = request_mem_region(res->start, resource_size(res), "wm8505fb"); + res = request_mem_region(res->start, resource_size(res), DRIVER_NAME); if (res == NULL) { dev_err(&pdev->dev, "failed to request I/O memory\n"); ret = -EBUSY; diff --git a/drivers/video/wmt_ge_rops.c b/drivers/video/wmt_ge_rops.c index f31883f..45832b7 100644 --- a/drivers/video/wmt_ge_rops.c +++ b/drivers/video/wmt_ge_rops.c @@ -127,13 +127,11 @@ EXPORT_SYMBOL_GPL(wmt_ge_sync); static int __devinit wmt_ge_rops_probe(struct platform_device *pdev) { struct resource *res; - int ret; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (res == NULL) { dev_err(&pdev->dev, "no I/O memory resource defined\n"); - ret = -ENODEV; - goto error; + return -ENODEV; } /* Only one ROP engine is presently supported. */ @@ -145,17 +143,13 @@ static int __devinit wmt_ge_rops_probe(struct platform_device *pdev) regbase = ioremap(res->start, resource_size(res)); if (regbase == NULL) { dev_err(&pdev->dev, "failed to map I/O memory\n"); - ret = -EBUSY; - goto error; + return -EBUSY; } writel(1, regbase + GE_ENABLE_OFF); printk(KERN_INFO "Enabled support for WMT GE raster acceleration\n"); return 0; - -error: - return ret; } static int __devexit wmt_ge_rops_remove(struct platform_device *pdev)