Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758077Ab2FQU0E (ORCPT ); Sun, 17 Jun 2012 16:26:04 -0400 Received: from ogre.sisk.pl ([193.178.161.156]:46792 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757473Ab2FQUZy (ORCPT ); Sun, 17 Jun 2012 16:25:54 -0400 From: "Rafael J. Wysocki" To: platform-driver-x86@vger.kernel.org Subject: [PATCH 5/5] intel_ips: Remove empty legacy PM callbacks Date: Sun, 17 Jun 2012 22:30:40 +0200 User-Agent: KMail/1.13.6 (Linux/3.5.0-rc3+; KDE/4.6.0; x86_64; ; ) Cc: Henrique de Moraes Holschuh , LKML , Linux PM list , Matthew Garrett , Joey Lee , Jesse Barnes , Jesse Barnes References: <201206172226.42729.rjw@sisk.pl> In-Reply-To: <201206172226.42729.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201206172230.40711.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1392 Lines: 51 From: Rafael J. Wysocki The legacy PM callbacks provided by the Intel IPS driver are empty routines returning 0, so they can be safely dropped. Signed-off-by: Rafael J. Wysocki --- drivers/platform/x86/intel_ips.c | 17 ----------------- 1 file changed, 17 deletions(-) Index: linux/drivers/platform/x86/intel_ips.c =================================================================== --- linux.orig/drivers/platform/x86/intel_ips.c +++ linux/drivers/platform/x86/intel_ips.c @@ -1697,21 +1697,6 @@ static void ips_remove(struct pci_dev *d dev_dbg(&dev->dev, "IPS driver removed\n"); } -#ifdef CONFIG_PM -static int ips_suspend(struct pci_dev *dev, pm_message_t state) -{ - return 0; -} - -static int ips_resume(struct pci_dev *dev) -{ - return 0; -} -#else -#define ips_suspend NULL -#define ips_resume NULL -#endif /* CONFIG_PM */ - static void ips_shutdown(struct pci_dev *dev) { } @@ -1721,8 +1706,6 @@ static struct pci_driver ips_pci_driver .id_table = ips_id_table, .probe = ips_probe, .remove = ips_remove, - .suspend = ips_suspend, - .resume = ips_resume, .shutdown = ips_shutdown, }; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/