From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 626AEC04AB2 for ; Thu, 9 May 2019 14:15:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2E09F21479 for ; Thu, 9 May 2019 14:15:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557411322; bh=JUIHOpOWl8G/bzkBQeOThiXiw1eqS3UO5cr6p0ZvWOA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JdTy1RBgpLG3ZXkZ/sWja1oA4GUseqy41C1rsv8KrL9CwNVBdZiI/uNaQq8FSeUCJ sFPceCMUbibaw6T9yI4ROp/3YYu5T7pS6n1hv996Zoy9aArXKrYEUpH1Y9rmgdw48Y YEhlv93qhLSShq2Vwlt7hml5VAdOEjLTj/AykNJc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727037AbfEIOPV (ORCPT ); Thu, 9 May 2019 10:15:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:50236 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726986AbfEIOPN (ORCPT ); Thu, 9 May 2019 10:15:13 -0400 Received: from localhost (50-81-63-4.client.mchsi.com [50.81.63.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F082D21479; Thu, 9 May 2019 14:15:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557411313; bh=JUIHOpOWl8G/bzkBQeOThiXiw1eqS3UO5cr6p0ZvWOA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mAK2mXWhGbuXKAzGUcsm0Cz7EXtcRGQ7bPsZOHrkInSXztIU+eb8JT5WRdL8/uhN7 9MEL0mVRPvBnPT+ILschTnOaBZXEdUEGJHEt2Qtw4DkcXL9cv3zpqZOoTEOnVIsxXL +HzrSwWF7+f3OSohZiwUO1oCJcFII6lTyyp3d86g= From: Bjorn Helgaas To: Frederick Lawler Cc: Mika Westerberg , Lukas Wunner , Andy Shevchenko , Keith Busch , Dongdong Liu , Sven Van Asbroeck , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 05/10] PCI: pciehp: Remove pciehp_debug uses Date: Thu, 9 May 2019 09:14:51 -0500 Message-Id: <20190509141456.223614-6-helgaas@kernel.org> X-Mailer: git-send-email 2.21.0.1020.gf2820cf01a-goog In-Reply-To: <20190509141456.223614-1-helgaas@kernel.org> References: <20190509141456.223614-1-helgaas@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bjorn Helgaas We're about to convert pciehp to the dyndbg mechanism, which means we can eventually remove pciehp_debug. Replace uses of pciehp_debug with dbg() and ctrl_dbg(), which check pciehp_debug internally. Signed-off-by: Bjorn Helgaas --- drivers/pci/hotplug/pciehp_hpc.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 6a2365cd794e..e121f1c06c21 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -232,8 +232,8 @@ static bool pci_bus_check_dev(struct pci_bus *bus, int devfn) delay -= step; } while (delay > 0); - if (count > 1 && pciehp_debug) - printk(KERN_DEBUG "pci %04x:%02x:%02x.%d id reading try %d times with interval %d ms to get %08x\n", + if (count > 1) + dbg("pci %04x:%02x:%02x.%d id reading try %d times with interval %d ms to get %08x\n", pci_domain_nr(bus), bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn), count, step, l); @@ -822,14 +822,11 @@ static inline void dbg_ctrl(struct controller *ctrl) struct pci_dev *pdev = ctrl->pcie->port; u16 reg16; - if (!pciehp_debug) - return; - - ctrl_info(ctrl, "Slot Capabilities : 0x%08x\n", ctrl->slot_cap); + ctrl_dbg(ctrl, "Slot Capabilities : 0x%08x\n", ctrl->slot_cap); pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, ®16); - ctrl_info(ctrl, "Slot Status : 0x%04x\n", reg16); + ctrl_dbg(ctrl, "Slot Status : 0x%04x\n", reg16); pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, ®16); - ctrl_info(ctrl, "Slot Control : 0x%04x\n", reg16); + ctrl_dbg(ctrl, "Slot Control : 0x%04x\n", reg16); } #define FLAG(x, y) (((x) & (y)) ? '+' : '-') -- 2.21.0.1020.gf2820cf01a-goog