From patchwork Mon Nov 27 18:38:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 10077759 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A3466602BD for ; Mon, 27 Nov 2017 18:43:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9922728F67 for ; Mon, 27 Nov 2017 18:43:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C64928F6E; Mon, 27 Nov 2017 18:43:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1748028F66 for ; Mon, 27 Nov 2017 18:43:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Date:Message-Id:MIME-Version:Subject:To :From:References:In-Reply-To:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3O8ptEMjgoXikL1VNqwikUBCIwxLwQIxSbqSMY3ETnc=; b=fCquMIQ35tpZT7 pNy/HrDlv+jYUAqNLzbpKiSs3s5kr0WrVxzwVQ/Z1oH/JCUjJQv4AuZfmte2lbURCHbvcHDpfG+5E W+9A8+sY6MfF+CGl7tZ4tYvl1VOgXERR1LXQ7xEcSG4N7Vy7AYDiMp0Q02fgOfgFKXjUqy8MbLFVg u6CI7p9CBrxkaNnn0bWhsrQmHFf2IgSG93HGfTauSIbEQWdOlAiT6AnDdcDXv2v18N6qlT4XDYPUK 6Z1RPYdkYKndpaF8w+EB1R4C32mk2CbonExxQjNtH2G2y8J4uBz/Kl5nK1IfukV54vvatYNl4Y6dL 0lIOaZ0VWfhjR0Zsa8ZA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eJOMv-0000t3-Fg; Mon, 27 Nov 2017 18:43:01 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eJOJ4-0006RL-G5 for linux-arm-kernel@lists.infradead.org; Mon, 27 Nov 2017 18:39:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2014; h=Date:Sender:Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References:In-Reply-To; bh=okzc0cf16VfGQ5lg9aqnIYUrZFkqaA1SmvsZmDxWpZo=; b=LlkHxI3dkkjn0h7r3a3tcspWs+e8Kb/ooe+Xk2M/wvpvy7oAkLxG1JIKCtAyOEHCKWKvIgwD6V7koRxRzdeQBW8dKjp4cOlaNMbqE7ZY+oPzINwONdXhDlYrVJ4yX0F/N5AS363COoXM5yhFwbmmO1SY2m/0uPiP98Jcaqsixaw=; Received: from e0022681537dd.dyn.armlinux.org.uk ([2001:4d48:ad52:3201:222:68ff:fe15:37dd]:37610 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1eJOIe-0000rA-OQ; Mon, 27 Nov 2017 18:38:36 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1eJOId-0006oK-Tf; Mon, 27 Nov 2017 18:38:35 +0000 In-Reply-To: <20171127183811.GM31757@n2100.armlinux.org.uk> References: <20171127183811.GM31757@n2100.armlinux.org.uk> From: Russell King To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/6] ARM: sa1111: remove legacy shutdown method MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 27 Nov 2017 18:38:35 +0000 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171127_103905_415896_292EEF16 X-CRM114-Status: GOOD ( 11.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Gleixner , "Rafael J. Wysocki" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Since the only user of the SA1111 device driver shutdown method has now gone, we can kill the bus level support code and the entry in the sa1111 device driver structure. Signed-off-by: Russell King --- arch/arm/common/sa1111.c | 9 --------- arch/arm/include/asm/hardware/sa1111.h | 1 - 2 files changed, 10 deletions(-) diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 4ecd5120fce7..1fcf06d1cda8 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -1401,14 +1401,6 @@ static int sa1111_bus_resume(struct device *dev) return ret; } -static void sa1111_bus_shutdown(struct device *dev) -{ - struct sa1111_driver *drv = SA1111_DRV(dev->driver); - - if (drv && drv->shutdown) - drv->shutdown(to_sa1111_device(dev)); -} - static int sa1111_bus_probe(struct device *dev) { struct sa1111_dev *sadev = to_sa1111_device(dev); @@ -1438,7 +1430,6 @@ struct bus_type sa1111_bus_type = { .remove = sa1111_bus_remove, .suspend = sa1111_bus_suspend, .resume = sa1111_bus_resume, - .shutdown = sa1111_bus_shutdown, }; EXPORT_SYMBOL(sa1111_bus_type); diff --git a/arch/arm/include/asm/hardware/sa1111.h b/arch/arm/include/asm/hardware/sa1111.h index 0bbf163d1ed3..b4411add2ea8 100644 --- a/arch/arm/include/asm/hardware/sa1111.h +++ b/arch/arm/include/asm/hardware/sa1111.h @@ -433,7 +433,6 @@ struct sa1111_driver { int (*remove)(struct sa1111_dev *); int (*suspend)(struct sa1111_dev *, pm_message_t); int (*resume)(struct sa1111_dev *); - void (*shutdown)(struct sa1111_dev *); }; #define SA1111_DRV(_d) container_of((_d), struct sa1111_driver, drv)