From patchwork Sat Apr 27 19:13:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederick Lawler X-Patchwork-Id: 1092093 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=fredlawl.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=fredlawl-com.20150623.gappssmtp.com header.i=@fredlawl-com.20150623.gappssmtp.com header.b="JOvsdfrL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44s0vQ4CWHz9s9T for ; Sun, 28 Apr 2019 05:13:38 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726373AbfD0TNc (ORCPT ); Sat, 27 Apr 2019 15:13:32 -0400 Received: from mail-oi1-f196.google.com ([209.85.167.196]:42631 "EHLO mail-oi1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726302AbfD0TNT (ORCPT ); Sat, 27 Apr 2019 15:13:19 -0400 Received: by mail-oi1-f196.google.com with SMTP id k9so2478203oig.9 for ; Sat, 27 Apr 2019 12:13:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fredlawl-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=72QnkVeZl7BGBdu2NJ1aFkR+mDly/cwA9f117/+WG0c=; b=JOvsdfrLGx0Z/mfrolVdvjMD2RzCD1EcNkwvFBrR7Gj5V91Yg2TiQEJjbGYcV6K1F7 bXCIHfqsSe4SE55RivmoKL7NeBQ/tBk6O1YXCMbF3F9ZbltBRmk3I8BiJVRptv1l6o/F Q1FFYbuQFwVigg7Gilr6q3kjrO1IqCzfXR/q5EDs1xqQMj9btcTweyM1dUm0492lLpjj uswDJ0FpzNyz7bzuTd1XXqkcDLamerUFO5Bd5fnuUh3UXg73n0IBmgsC7echL3DB099G imbUp/QPkvFZQq88fWPwReQyT1sqCl7Vau2/xfdSCSDtzewfp0rlkzhs/1pOeRLfjAKj Dlgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=72QnkVeZl7BGBdu2NJ1aFkR+mDly/cwA9f117/+WG0c=; b=tJDVRBhK+NSEBukZgiq3QmPAr6pZY8ipOD20HOsytZG/weqsU1tpzSftR89uzUbeLu LE63wUAtV42uNbLof6F6iYivrzkJDUQEZhsmt6db7Yd7Yue4tzdRTYV/7Va8MWRZqpQA QdLXmnuUPyddUEyOoFcNMvcx9/Onw1ZCsqzhzL+D3Ttv3AEZ5Ahbbt0WNOqTIdg/cqCa nsgeSKoACW2NnH/Um06u/zNO8V6wtgB2VTD+baq+n9SpmpUNDTvOLorAQ5E4dYMRkZWo KPyRu65IFk74pb+lMwW4HI1zjwCJRN+qB7GyI6OLXcO44MIWBxOEfRVmw2WsthZSdoQE ILUw== X-Gm-Message-State: APjAAAUiKxXZqwvGXKhaxGXx8DzbUZ7uWBtbdulnmztvzccUaTr25yzZ gGw0iG98b3bVL5JczpmQziLyKA== X-Google-Smtp-Source: APXvYqytY1MBFt8L0ldKkuSzlceSWGuMYehjsfVSwHqCLLcOLvRtWODpjdApDIgV5tLzaYnwVQxZaw== X-Received: by 2002:aca:df44:: with SMTP id w65mr10517932oig.66.1556392398832; Sat, 27 Apr 2019 12:13:18 -0700 (PDT) Received: from linux.fredlawl.com ([2600:1700:18a0:11d0:3d43:9acc:6ecc:a72c]) by smtp.gmail.com with ESMTPSA id w2sm11373096otk.73.2019.04.27.12.13.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 27 Apr 2019 12:13:18 -0700 (PDT) From: fred@fredlawl.com To: bhelgaas@google.com Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, mika.westerberg@linux.intel.com, lukas@wunner.de, andriy.shevchenko@linux.intel.com, keith.busch@intel.com, mr.nuke.me@gmail.com, liudongdong3@huawei.com, thesven73@gmail.com, Frederick Lawler Subject: [PATCH 3/4] PCI: pciehp: Remove unused macro definitions Date: Sat, 27 Apr 2019 14:13:03 -0500 Message-Id: <20190427191304.32502-4-fred@fredlawl.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190427191304.32502-1-fred@fredlawl.com> References: <20190427191304.32502-1-fred@fredlawl.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Frederick Lawler Now that all uses for the ctrl_*() printk wrappers are removed from files and replaces with pci_*() or pr_*() printk wrappers, remove the unused macro definitions. In addition to that, remove the MY_NAME macro. Signed-off-by: Frederick Lawler --- drivers/pci/hotplug/pciehp.h | 27 --------------------------- drivers/pci/hotplug/pciehp_hpc.c | 2 +- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index 506e1d923a1f..7d3a32a1504a 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h @@ -25,37 +25,10 @@ #include "../pcie/portdrv.h" -#define MY_NAME "pciehp" - extern bool pciehp_poll_mode; extern int pciehp_poll_time; extern bool pciehp_debug; -#define dbg(format, arg...) \ -do { \ - if (pciehp_debug) \ - printk(KERN_DEBUG "%s: " format, MY_NAME, ## arg); \ -} while (0) -#define err(format, arg...) \ - printk(KERN_ERR "%s: " format, MY_NAME, ## arg) -#define info(format, arg...) \ - printk(KERN_INFO "%s: " format, MY_NAME, ## arg) -#define warn(format, arg...) \ - printk(KERN_WARNING "%s: " format, MY_NAME, ## arg) - -#define ctrl_dbg(ctrl, format, arg...) \ - do { \ - if (pciehp_debug) \ - dev_printk(KERN_DEBUG, &ctrl->pcie->device, \ - format, ## arg); \ - } while (0) -#define ctrl_err(ctrl, format, arg...) \ - dev_err(&ctrl->pcie->device, format, ## arg) -#define ctrl_info(ctrl, format, arg...) \ - dev_info(&ctrl->pcie->device, format, ## arg) -#define ctrl_warn(ctrl, format, arg...) \ - dev_warn(&ctrl->pcie->device, format, ## arg) - #define SLOT_NAME_SIZE 10 /** diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 5e5631fd0171..28a132a0d9db 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -47,7 +47,7 @@ static inline int pciehp_request_irq(struct controller *ctrl) /* Installs the interrupt handler */ retval = request_threaded_irq(irq, pciehp_isr, pciehp_ist, - IRQF_SHARED, MY_NAME, ctrl); + IRQF_SHARED, "pciehp", ctrl); if (retval) pci_err(pdev, "Cannot get irq %d for the hotplug controller\n", irq);