From patchwork Tue Sep 26 20:47:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rafael J. Wysocki" X-Patchwork-Id: 9972741 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 94102602BD for ; Tue, 26 Sep 2017 20:57:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8720F28EBB for ; Tue, 26 Sep 2017 20:57:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7BA1128FBD; Tue, 26 Sep 2017 20:57:00 +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=-1.7 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_MED, SUSPICIOUS_RECIPS autolearn=no 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 0A90728EBB for ; Tue, 26 Sep 2017 20:56:59 +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:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=h7gkM1uC9vKKaLVVklEx4KGnZ5Aj8Ap7TJfmQz7f1rI=; b=srfoot8IpBqvXd iwDbBoH+cHshxBOAP+/GW0jPInynUCRzrHs0o5+y6TmmDw5Mtym65+cAAXLbi+tc+tdV3RKtpS5VH +tnaaVo1Hew5eS3+zNmZkbfd+wLlzgywG9GXtb/EWyQQLNVAbedvtv5thnfGlMzFIVjrevrVEGSOT DCSTyqJLsOVVhBqthCP2UXlbqxvowzye3x8n6rLB9rMZlkLTf16QXCjevCPqWV7W8yBcZ5E/XLjSP MrSHin5JjIcqfbG72OkwduxoQ1Q9hWEK339BpG3T9eM/kmBlc/gYh0BfuzZa5OBtrjMZnp8ZcBb4V P5kww5EmCCr1rcC9qSLg==; 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 1dwwuP-0007ER-0G; Tue, 26 Sep 2017 20:56:49 +0000 Received: from cloudserver094114.home.net.pl ([79.96.170.134]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dwwuL-0006iJ-94 for linux-arm-kernel@lists.infradead.org; Tue, 26 Sep 2017 20:56:47 +0000 Received: from 79.184.252.54.ipv4.supernova.orange.pl (79.184.252.54) (HELO aspire.rjw.lan) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer 0.82) id a9e0b86e53681a64; Tue, 26 Sep 2017 22:56:22 +0200 From: "Rafael J. Wysocki" To: Russell King , Linux PM Subject: [PATCH] PM: ARM: sa1111: Drop suspend and resume bus type callbacks Date: Tue, 26 Sep 2017 22:47:10 +0200 Message-ID: <2654085.Tx1JnNWXkX@aspire.rjw.lan> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170926_135645_505559_1B359917 X-CRM114-Status: UNSURE ( 7.49 ) X-CRM114-Notice: Please train this message. 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: Greg Kroah-Hartman , LKML , linux-arm-kernel@lists.infradead.org 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 From: Rafael J. Wysocki None of the sa1111 drivers in the tree implements the suspend and resume callbacks from struct sa1111_driver, so drop them and drop the corresponding callbacks from sa1111_bus_type. Signed-off-by: Rafael J. Wysocki --- arch/arm/common/sa1111.c | 24 ------------------------ arch/arm/include/asm/hardware/sa1111.h | 2 -- 2 files changed, 26 deletions(-) Index: linux-pm/arch/arm/include/asm/hardware/sa1111.h =================================================================== --- linux-pm.orig/arch/arm/include/asm/hardware/sa1111.h +++ linux-pm/arch/arm/include/asm/hardware/sa1111.h @@ -430,8 +430,6 @@ struct sa1111_driver { unsigned int devid; int (*probe)(struct sa1111_dev *); int (*remove)(struct sa1111_dev *); - int (*suspend)(struct sa1111_dev *, pm_message_t); - int (*resume)(struct sa1111_dev *); void (*shutdown)(struct sa1111_dev *); }; Index: linux-pm/arch/arm/common/sa1111.c =================================================================== --- linux-pm.orig/arch/arm/common/sa1111.c +++ linux-pm/arch/arm/common/sa1111.c @@ -1379,28 +1379,6 @@ static int sa1111_match(struct device *_ return !!(dev->devid & drv->devid); } -static int sa1111_bus_suspend(struct device *dev, pm_message_t state) -{ - struct sa1111_dev *sadev = to_sa1111_device(dev); - struct sa1111_driver *drv = SA1111_DRV(dev->driver); - int ret = 0; - - if (drv && drv->suspend) - ret = drv->suspend(sadev, state); - return ret; -} - -static int sa1111_bus_resume(struct device *dev) -{ - struct sa1111_dev *sadev = to_sa1111_device(dev); - struct sa1111_driver *drv = SA1111_DRV(dev->driver); - int ret = 0; - - if (drv && drv->resume) - ret = drv->resume(sadev); - return ret; -} - static void sa1111_bus_shutdown(struct device *dev) { struct sa1111_driver *drv = SA1111_DRV(dev->driver); @@ -1436,8 +1414,6 @@ struct bus_type sa1111_bus_type = { .match = sa1111_match, .probe = sa1111_bus_probe, .remove = sa1111_bus_remove, - .suspend = sa1111_bus_suspend, - .resume = sa1111_bus_resume, .shutdown = sa1111_bus_shutdown, }; EXPORT_SYMBOL(sa1111_bus_type);