lkml.org 
[lkml]   [2019]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/4] PCI: pciehp: Remove unused macro definitions
    Date
    From: Frederick Lawler <fred@fredlawl.com>

    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 <fred@fredlawl.com>
    ---
    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);
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-04-27 21:14    [W:3.360 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site