From patchwork Tue Sep 23 19:41:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Einon X-Patchwork-Id: 392647 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C202E140088 for ; Wed, 24 Sep 2014 05:41:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756692AbaIWTlb (ORCPT ); Tue, 23 Sep 2014 15:41:31 -0400 Received: from mail-we0-f179.google.com ([74.125.82.179]:53053 "EHLO mail-we0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756681AbaIWTl3 (ORCPT ); Tue, 23 Sep 2014 15:41:29 -0400 Received: by mail-we0-f179.google.com with SMTP id u56so5041308wes.38 for ; Tue, 23 Sep 2014 12:41:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rYVjMZCafX4NmY+ktijYNC6rA0ObZLZuNhEtwuuatO0=; b=UC6G4Qvu/di5LU0jJ9mlHpycMnyQRPQk/TNUljMENZqjzJUIN3mUhUqJZReX0CowDF /0BpcxOcislixLB3gxEmHSwlXC7LrugdIgW8TUe5rTYxgaZPLPXxRAvUolhTJmEQFD1T ELLblBOt7yx5xv+/O60C2wctPOzPWjksasIuHbjEvusxKpBowM9B4NcMcgQBJrE4N1Cb io7XWoTEIjkUO7BIHXVMEUMZh3XS8KiSg+gXd1Ze5mtdlVKeqQzdzwa89U4AwfQKfvwU zUaFsHHr4qEBGFyqrWHFGE2MJkypJ3lmHaFjoNsVO2zDZ35xuxHYs1Z4BqmkAxRR7NyF ZagA== X-Received: by 10.180.210.201 with SMTP id mw9mr26025997wic.35.1411501287590; Tue, 23 Sep 2014 12:41:27 -0700 (PDT) Received: from msilap.einon.net ([80.229.23.162]) by mx.google.com with ESMTPSA id s7sm16967133wjo.48.2014.09.23.12.41.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Sep 2014 12:41:26 -0700 (PDT) From: Mark Einon To: gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, tklauser@distanz.ch, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Einon Subject: [PATCH 4/4] staging: et131x: Remove unnecessary defines to enable driver PM Date: Tue, 23 Sep 2014 20:41:14 +0100 Message-Id: <1411501274-2970-4-git-send-email-mark.einon@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1411501274-2970-1-git-send-email-mark.einon@gmail.com> References: <20140923100106.GE4657@distanz.ch> <1411501274-2970-1-git-send-email-mark.einon@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The Power Management functions can be conditional by assigning pm ops directly to .driver.pm, instead of using #ifdef's, saving some lines of code. Reported-by: Tobias Klauser Signed-off-by: Mark Einon --- drivers/staging/et131x/et131x.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 10f20b3..41fcaa0 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c @@ -3607,12 +3607,9 @@ static int et131x_resume(struct device *dev) return 0; } +#endif static SIMPLE_DEV_PM_OPS(et131x_pm_ops, et131x_suspend, et131x_resume); -#define ET131X_PM_OPS (&et131x_pm_ops) -#else -#define ET131X_PM_OPS NULL -#endif /* et131x_isr - The Interrupt Service Routine for the driver. * @irq: the IRQ on which the interrupt was received. @@ -4406,7 +4403,7 @@ static struct pci_driver et131x_driver = { .id_table = et131x_pci_table, .probe = et131x_pci_setup, .remove = et131x_pci_remove, - .driver.pm = ET131X_PM_OPS, + .driver.pm = &et131x_pm_ops, }; module_pci_driver(et131x_driver);