From patchwork Mon Jun 10 11:35:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 17727 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f72.google.com (mail-qe0-f72.google.com [209.85.128.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 56B3B25DF9 for ; Mon, 10 Jun 2013 11:50:35 +0000 (UTC) Received: by mail-qe0-f72.google.com with SMTP id 1sf1736506qec.7 for ; Mon, 10 Jun 2013 04:50:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=Eu4IX32vLN81qi0jwpU7Uny/TP0nD7zcONAJ7gaOMLM=; b=BGWP31q3gyd0Py+gqabOs+yCS69jpi/8ExIqth8oQpSZCZvC0Y+Atjga95exqEFcH4 1fysnIXSPmnJUP3MrhK+cNe1mx19dk0b5C8a9rk1ohzIlvB+A1T64NNsPdHrpJumtuS4 gKJ9n7q9XjDBwZUFqPS/2TiQvobDALUMGHQTOE3rSIlaSrg8wL11i0mvpghyUlieQErT h2OhpvpPtLgUJVkCGnCVyI/3WComP7dJXfj/U3gab1zVmmrCmZpwLRbi0Ljw0QN3ftW7 T4soYX1D4DkrGZEMnVLwsooF9/khxESsk6yINwJq0qJtb94luq1bW6JVvK3fOsmSc8Ai Kyfg== X-Received: by 10.224.53.198 with SMTP id n6mr8310673qag.2.1370865035124; Mon, 10 Jun 2013 04:50:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.48.4 with SMTP id h4ls2803444qen.50.gmail; Mon, 10 Jun 2013 04:50:34 -0700 (PDT) X-Received: by 10.52.190.130 with SMTP id gq2mr4566894vdc.37.1370865034889; Mon, 10 Jun 2013 04:50:34 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id tq4si4701044vdc.92.2013.06.10.04.50.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Jun 2013 04:50:34 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id ha12so834381vcb.7 for ; Mon, 10 Jun 2013 04:50:34 -0700 (PDT) X-Received: by 10.58.116.211 with SMTP id jy19mr5285212veb.7.1370865034770; Mon, 10 Jun 2013 04:50:34 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.10.206 with SMTP id pb14csp64981vcb; Mon, 10 Jun 2013 04:50:34 -0700 (PDT) X-Received: by 10.66.248.40 with SMTP id yj8mr13448622pac.95.1370865033919; Mon, 10 Jun 2013 04:50:33 -0700 (PDT) Received: from mail-pb0-x22d.google.com (mail-pb0-x22d.google.com [2607:f8b0:400e:c01::22d]) by mx.google.com with ESMTPS id qu10si4652018pbc.312.2013.06.10.04.50.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Jun 2013 04:50:33 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400e:c01::22d is neither permitted nor denied by best guess record for domain of tushar.behera@linaro.org) client-ip=2607:f8b0:400e:c01::22d; Received: by mail-pb0-f45.google.com with SMTP id mc8so7193850pbc.18 for ; Mon, 10 Jun 2013 04:50:33 -0700 (PDT) X-Received: by 10.68.13.199 with SMTP id j7mr9675659pbc.17.1370865033448; Mon, 10 Jun 2013 04:50:33 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id rn7sm10242037pbc.12.2013.06.10.04.50.28 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Jun 2013 04:50:30 -0700 (PDT) From: Tushar Behera To: linux-kernel@vger.kernel.org Cc: thierry.reding@gmail.com, patches@linaro.org, devel@driverdev.osuosl.org, Greg Kroah-Hartman Subject: [PATCH 10/15] Staging: netlogic: Convert to use devm_ioremap_resource Date: Mon, 10 Jun 2013 17:05:08 +0530 Message-Id: <1370864113-17895-11-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1370864113-17895-1-git-send-email-tushar.behera@linaro.org> References: <1370864113-17895-1-git-send-email-tushar.behera@linaro.org> X-Gm-Message-State: ALoCoQlYXJMFgM4Rr3zhB9qc+z/ESSPeBelwTHeZH0v9RDTe66Pcfl7avlFmEJXKjDZChr5wWk/m X-Original-Sender: tushar.behera@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()") introduced devm_ioremap_resource() and deprecated the use of devm_request_and_ioremap(). Signed-off-by: Tushar Behera CC: devel@driverdev.osuosl.org CC: Greg Kroah-Hartman --- drivers/staging/netlogic/xlr_net.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c index dd98cb1..c30fa54 100644 --- a/drivers/staging/netlogic/xlr_net.c +++ b/drivers/staging/netlogic/xlr_net.c @@ -1020,12 +1020,12 @@ static int xlr_net_probe(struct platform_device *pdev) goto err_gmac; } - ndev->base_addr = (unsigned long) devm_request_and_ioremap + ndev->base_addr = (unsigned long) devm_ioremap_resource (&pdev->dev, res); - if (!ndev->base_addr) { + if (IS_ERR_VALUE(ndev->base_addr)) { dev_err(&pdev->dev, - "devm_request_and_ioremap failed\n"); - return -EBUSY; + "devm_ioremap_resource failed\n"); + return ndev->base_addr; } res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);