From patchwork Wed Jun 18 15:16:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 4377301 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4B6A99F1C4 for ; Wed, 18 Jun 2014 15:17:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 779C02034A for ; Wed, 18 Jun 2014 15:17:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B683202FE for ; Wed, 18 Jun 2014 15:17:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751386AbaFRPRY (ORCPT ); Wed, 18 Jun 2014 11:17:24 -0400 Received: from mail-yk0-f170.google.com ([209.85.160.170]:50418 "EHLO mail-yk0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751215AbaFRPRX (ORCPT ); Wed, 18 Jun 2014 11:17:23 -0400 Received: by mail-yk0-f170.google.com with SMTP id q9so688977ykb.1 for ; Wed, 18 Jun 2014 08:17:23 -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; bh=WUp/E309sfGp3TYYy9ZchuVAQmsM+C52i+O5fpVKujk=; b=cCeBOTimD/8ykiPqfrtpCQ6U25lVA2MuZquYdOz61YDRewIb3hie3ZHqW2uID6qZV4 +rwEKxBdxbTREveqmNyTSUBTSNdU9bS7K3YbQ2g8kxkAuGSI2JirIKK8FlT8LcrppwF0 Y9xMyj7zBLxGEFzrLfzVxfqnDynuK6oGDTSZdilmZr2X2UW0TuIRvYrgjlCIth8lTMN4 mUKJHeWOOZl/YhYDqvPO0FG1I8USUi2AeEpJpSm20alLfnWHuD9obHPGroQw4yTlqwUR NBMvrACHnZXthTeROLD0LiSTxnPwUUPH3orEvuKzCNTLb9+diastIXEwDSvK7S/Xyb/G pifA== X-Received: by 10.236.84.202 with SMTP id s50mr55395558yhe.77.1403104642947; Wed, 18 Jun 2014 08:17:22 -0700 (PDT) Received: from localhost.localdomain ([201.82.193.130]) by mx.google.com with ESMTPSA id c29sm3877634yhb.7.2014.06.18.08.17.21 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Jun 2014 08:17:22 -0700 (PDT) From: Fabio Estevam To: bhelgaas@google.com Cc: jg1.han@samsung.com, linux-pci@vger.kernel.org, Fabio Estevam Subject: [PATCH] PCI: designware: Use IS_ENABLED() Date: Wed, 18 Jun 2014 12:16:53 -0300 Message-Id: <1403104613-9867-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.8.3.2 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 From: Fabio Estevam We can get rid of the 'ifdef' by using the IS_ENABLED() macro. Signed-off-by: Fabio Estevam Acked-by: Jingoo Han Acked-by: Mohit Kumar --- drivers/pci/host/pcie-designware.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c index 1eaf4df3..dc842fd 100644 --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c @@ -497,9 +497,8 @@ int __init dw_pcie_host_init(struct pcie_port *pp) pci_common_init_dev(pp->dev, &dw_pci); pci_assign_unassigned_resources(); -#ifdef CONFIG_PCI_DOMAINS - dw_pci.domain++; -#endif + if (IS_ENABLED(CONFIG_PCI_DOMAINS)) + dw_pci.domain++; return 0; }