From patchwork Tue May 21 16:41:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 245357 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9B44C2C0B3E for ; Wed, 22 May 2013 02:47:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754942Ab3EUQqn (ORCPT ); Tue, 21 May 2013 12:46:43 -0400 Received: from mail-ea0-f177.google.com ([209.85.215.177]:34768 "EHLO mail-ea0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753137Ab3EUQmQ (ORCPT ); Tue, 21 May 2013 12:42:16 -0400 Received: by mail-ea0-f177.google.com with SMTP id q14so530079eaj.36 for ; Tue, 21 May 2013 09:42:15 -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:x-mailer:in-reply-to:references; bh=QFksOd/DL4ul0eQwneVfXGPxG/DEBUweWzz9UXtE7n4=; b=TdFFAd+DCWWbZvpkWcWOmfk2gYq/cR38kzMekOxHevm/tfQO+cUE/uHgG22AonireQ 1V/J9ANemb7Hjr9kpbCZgr9Zyi3IFVaK7ir35SJ4+dOZOkQ1DOZGYmLS0nVTjuCEKeXQ dljIILWeW+UOv9whwfN4/DVUPiY5E8s2vqBzgCtEtw4moGVZJsFz1HVR1imXiBk3ydCK 0Z08AQE4V2zIzgpFIIrpmoyH48swsUcZ/AsOK3tvuxM0VMS4yPfUdAMSa8fqdv3yyA1U 5vyrB9fPCLbxPDE+GkMghNMzjGiDmshH5LrSE8EqYMtXtfZSJf7zZzQahxJXcPqegqo8 kwyA== X-Received: by 10.15.26.6 with SMTP id m6mr8580471eeu.4.1369154535371; Tue, 21 May 2013 09:42:15 -0700 (PDT) Received: from topkick.lan (dslc-082-083-251-181.pools.arcor-ip.net. [82.83.251.181]) by mx.google.com with ESMTPSA id w43sm4631176eeg.14.2013.05.21.09.42.13 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 May 2013 09:42:14 -0700 (PDT) Received: from edge.wm.mst.uni-hannover.de (firewall.mst.uni-hannover.de [130.75.30.51]) by topkick.lan (Postfix) with ESMTPSA id 175E5605CE; Tue, 21 May 2013 18:41:26 +0200 (CEST) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Cc: David Miller , Lennert Buytenhek , Jason Cooper , Andrew Lunn , Benjamin Herrenschmidt , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 02/12] net: mv643xx_eth: use managed devm_ioremap for port registers Date: Tue, 21 May 2013 18:41:40 +0200 Message-Id: <1369154510-4927-3-git-send-email-sebastian.hesselbarth@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1369154510-4927-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1367854420-8006-1-git-send-email-sebastian.hesselbarth@gmail.com> <1369154510-4927-1-git-send-email-sebastian.hesselbarth@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make use of managed devm_ioremap and remove corresponding iounmap. Signed-off-by: Sebastian Hesselbarth --- Cc: David Miller Cc: Lennert Buytenhek Cc: Jason Cooper Cc: Andrew Lunn Cc: Benjamin Herrenschmidt Cc: netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org --- drivers/net/ethernet/marvell/mv643xx_eth.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index ef3454c..e658ebd 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -2470,7 +2470,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev) if (msp == NULL) return -ENOMEM; - msp->base = ioremap(res->start, resource_size(res)); + msp->base = devm_ioremap(&pdev->dev, res->start, resource_size(res)); if (msp->base == NULL) return -ENOMEM; @@ -2498,7 +2498,6 @@ static int mv643xx_eth_shared_remove(struct platform_device *pdev) { struct mv643xx_eth_shared_private *msp = platform_get_drvdata(pdev); - iounmap(msp->base); if (!IS_ERR(msp->clk)) clk_disable_unprepare(msp->clk);