From patchwork Thu Oct 3 09:46:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 2981781 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 88AA1BFF0B for ; Thu, 3 Oct 2013 09:47:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5D06E20161 for ; Thu, 3 Oct 2013 09:47:55 +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 8EA4220322 for ; Thu, 3 Oct 2013 09:47:50 +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 1VRfVK-0003Jc-4k; Thu, 03 Oct 2013 09:47:30 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRfVE-0005BZ-Sb; Thu, 03 Oct 2013 09:47:24 +0000 Received: from mail-ee0-f46.google.com ([74.125.83.46]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRfV8-00059Z-QS for linux-arm-kernel@lists.infradead.org; Thu, 03 Oct 2013 09:47:19 +0000 Received: by mail-ee0-f46.google.com with SMTP id c13so972287eek.33 for ; Thu, 03 Oct 2013 02:46:57 -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=lTVMCiEHXKP4xBPGYq65G6HT4bmsya6WQxuNxui1Pyw=; b=Yo3mYd+DDida/rrNwa32DxJL1ipE8fxSXr7O+T9LrGi31ZMoCz4XOt1HHHspGUOBmz 6dq7ol8z7TD+sSFzUDrpGUI3Vz6H3uK+z5TCTF4xJ+Ns5keVbb0o1lM/QH/9B58tNSVa Tlvdl6tJwL4DuNuNTKalRnx7BKN2zmo7UcXiEnTD4hkx76sDDJxUyvVo6B/Aki3bn+u4 L5DcFBaBlAbGmbqIXrPIQ5Oa1LUXNpDzLrenoeHyPI1m7amxWW6vzkMhhvq95OBHF2Mz m+UDi56MmgFjOmNSXXYRWIBlxiCj8wosWrA1kkOJjGC+bSfnjcc8fn0Odak6tn8eqEhS qeEw== X-Gm-Message-State: ALoCoQl7rsYfLnmY8iV2L475k2BCRJRKXcCVROMhfxQnKmJXxT3tm1nJX3J0Osdhfx8oGTnAqT6T X-Received: by 10.14.45.70 with SMTP id o46mr11369459eeb.19.1380793617123; Thu, 03 Oct 2013 02:46:57 -0700 (PDT) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPSA id k7sm13668549eeg.13.1969.12.31.16.00.00 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Thu, 03 Oct 2013 02:46:55 -0700 (PDT) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu Subject: [PATCH 5/9] rtc: amba: Remove unnecessary amba_set_drvdata() Date: Thu, 3 Oct 2013 11:46:27 +0200 Message-Id: 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_054718_998575_06D42A11 X-CRM114-Status: GOOD ( 13.76 ) X-Spam-Score: -1.9 (-) Cc: Alessandro Zummo , Linus Walleij , linux-arm-kernel@lists.infradead.org, rtc-linux@googlegroups.com 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 --- drivers/rtc/rtc-pl030.c | 2 -- drivers/rtc/rtc-pl031.c | 2 -- 2 files changed, 4 deletions(-) -- 1.8.2.3 diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c index 22bacdb..a804f75 100644 --- a/drivers/rtc/rtc-pl030.c +++ b/drivers/rtc/rtc-pl030.c @@ -153,8 +153,6 @@ static int pl030_remove(struct amba_device *dev) { struct pl030_rtc *rtc = amba_get_drvdata(dev); - amba_set_drvdata(dev, NULL); - writel(0, rtc->base + RTC_CR); free_irq(dev->irq[0], rtc); diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c index 0f0609b..c9ca86e 100644 --- a/drivers/rtc/rtc-pl031.c +++ b/drivers/rtc/rtc-pl031.c @@ -305,7 +305,6 @@ static int pl031_remove(struct amba_device *adev) { struct pl031_local *ldata = dev_get_drvdata(&adev->dev); - amba_set_drvdata(adev, NULL); free_irq(adev->irq[0], ldata); rtc_device_unregister(ldata->rtc); iounmap(ldata->base); @@ -392,7 +391,6 @@ out_no_irq: rtc_device_unregister(ldata->rtc); out_no_rtc: iounmap(ldata->base); - amba_set_drvdata(adev, NULL); out_no_remap: kfree(ldata); out: