From patchwork Thu Oct 3 09:46:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 2981701 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8A2AEBFF0B for ; Thu, 3 Oct 2013 09:47:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BDCE820161 for ; Thu, 3 Oct 2013 09:47:31 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0681920318 for ; Thu, 3 Oct 2013 09:47:25 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRfV9-0003Ev-Uh; Thu, 03 Oct 2013 09:47:20 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRfV7-0005AF-MJ; Thu, 03 Oct 2013 09:47:17 +0000 Received: from mail-ee0-f52.google.com ([74.125.83.52]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRfV3-00059X-V2 for linux-arm-kernel@lists.infradead.org; Thu, 03 Oct 2013 09:47:15 +0000 Received: by mail-ee0-f52.google.com with SMTP id c41so956144eek.39 for ; Thu, 03 Oct 2013 02:46:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references:content-type; bh=x+XCmwHyH3AvmNx8vQLOfV6ZlpZhS3oFBshLEi9zojo=; b=iXTpsKBfxui9u3Edyg8A5sE5fDi4dbQ8x+k/tVQwXuP9fzi7vmRrA7N5v9Uif3ouTU JJzc9Se6+7dIpTHTxvad6kxC5apExrGi8U0g+pVbWX3M4Bsgq8D8YIsUQls85CcCpKqL hDTqgseS9eDp6iKXWpXM/dITWYX6tOK8dZ0U1nimU0fvdLjt6q/j9QtvnIdpk/qie5/G 31EGTlD73/ntJfXRN5ouYPUTO2Y24cugyaLNusDWIfbNnMfr38X0T+ljfBALyaTDIlv6 My1gDPEfsd8/yj2WPjYfSq2tbWQYEzuqz4ipszl+rhRK8gWwLrrAF1pxdMTbpWW4c2qR zKBg== X-Gm-Message-State: ALoCoQlahrDtA05ZTszCH2J+RE0+qd5MbD848ZaxHIEQsy4rj5/CVCbiHviXVb8ZEHrxPQck/BXY X-Received: by 10.14.214.136 with SMTP id c8mr11256431eep.6.1380793611076; Thu, 03 Oct 2013 02:46:51 -0700 (PDT) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPSA id x47sm13664975eea.16.1969.12.31.16.00.00 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Thu, 03 Oct 2013 02:46:49 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu Subject: [PATCH 3/9] ARM: etm: Remove unnecessary amba_set_drvdata() Date: Thu, 3 Oct 2013 11:46:25 +0200 Message-Id: <19b5da63fa3f75504d330c3fc8ead21cc88bd563.1380793579.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: <27e289763bbcb7d10f84081543cfc3a4dc770398.1380793579.git.michal.simek@xilinx.com> References: <27e289763bbcb7d10f84081543cfc3a4dc770398.1380793579.git.michal.simek@xilinx.com> In-Reply-To: <27e289763bbcb7d10f84081543cfc3a4dc770398.1380793579.git.michal.simek@xilinx.com> References: <27e289763bbcb7d10f84081543cfc3a4dc770398.1380793579.git.michal.simek@xilinx.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131003_054714_135566_57209187 X-CRM114-Status: GOOD ( 13.37 ) X-Spam-Score: -1.9 (-) Cc: Russell King , Greg Kroah-Hartman , Randy Dunlap , Andrew Morton , linux-arm-kernel@lists.infradead.org, "zhangwei\(Jovi\)" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS, 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 Driver core clears the driver data to NULL after device_release or on probe failure, so just remove it from here. Driver core change: "device-core: Ensure drvdata = NULL when no driver is bound" (sha1: 0998d0631001288a5974afc0b2a5f568bcdecb4d) Signed-off-by: Michal Simek --- arch/arm/kernel/etm.c | 6 ------ 1 file changed, 6 deletions(-) -- 1.8.2.3 diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c index 8ff0ecd..131a6ab 100644 --- a/arch/arm/kernel/etm.c +++ b/arch/arm/kernel/etm.c @@ -385,7 +385,6 @@ out: return ret; out_unmap: - amba_set_drvdata(dev, NULL); iounmap(t->etb_regs); out_release: @@ -398,8 +397,6 @@ static int etb_remove(struct amba_device *dev) { struct tracectx *t = amba_get_drvdata(dev); - amba_set_drvdata(dev, NULL); - iounmap(t->etb_regs); t->etb_regs = NULL; @@ -588,7 +585,6 @@ out: return ret; out_unmap: - amba_set_drvdata(dev, NULL); iounmap(t->etm_regs); out_release: @@ -601,8 +597,6 @@ static int etm_remove(struct amba_device *dev) { struct tracectx *t = amba_get_drvdata(dev); - amba_set_drvdata(dev, NULL); - iounmap(t->etm_regs); t->etm_regs = NULL;