lkml.org 
[lkml]   [2014]   [Apr]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 69/73] drivers/pci: delete non-required instances of <linux/init.h>
    On Tue, Jan 21, 2014 at 04:23:12PM -0500, Paul Gortmaker wrote:
    > None of these files are actually using any __init type directives
    > and hence don't need to include <linux/init.h>. Most are just a
    > left over from __devinit and __cpuinit removal, or simply due to
    > code getting copied from one driver to the next.
    >
    > Cc: Bjorn Helgaas <bhelgaas@google.com>
    > Cc: linux-pci@vger.kernel.org
    > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

    I applied this to my "pci/pending" branch. After v3.15-rc1, I will sort
    this into something for inclusion in -next.

    Sorry for the delay; I don't remember why I didn't pick this up before.

    Bjorn

    > ---
    > drivers/pci/bus.c | 1 -
    > drivers/pci/host-bridge.c | 1 -
    > drivers/pci/hotplug/acpiphp_glue.c | 1 -
    > drivers/pci/hotplug/cpqphp_nvram.c | 1 -
    > drivers/pci/hotplug/s390_pci_hpc.c | 1 -
    > drivers/pci/msi.c | 1 -
    > drivers/pci/search.c | 1 -
    > drivers/pci/setup-irq.c | 1 -
    > drivers/pci/setup-res.c | 1 -
    > 9 files changed, 9 deletions(-)
    >
    > diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
    > index 00660cc..ad0f20a 100644
    > --- a/drivers/pci/bus.c
    > +++ b/drivers/pci/bus.c
    > @@ -13,7 +13,6 @@
    > #include <linux/errno.h>
    > #include <linux/ioport.h>
    > #include <linux/proc_fs.h>
    > -#include <linux/init.h>
    > #include <linux/slab.h>
    >
    > #include "pci.h"
    > diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c
    > index 06ace62..389e3df 100644
    > --- a/drivers/pci/host-bridge.c
    > +++ b/drivers/pci/host-bridge.c
    > @@ -3,7 +3,6 @@
    > */
    >
    > #include <linux/kernel.h>
    > -#include <linux/init.h>
    > #include <linux/pci.h>
    > #include <linux/module.h>
    >
    > diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
    > index cd929ae..1629963 100644
    > --- a/drivers/pci/hotplug/acpiphp_glue.c
    > +++ b/drivers/pci/hotplug/acpiphp_glue.c
    > @@ -41,7 +41,6 @@
    >
    > #define pr_fmt(fmt) "acpiphp_glue: " fmt
    >
    > -#include <linux/init.h>
    > #include <linux/module.h>
    >
    > #include <linux/kernel.h>
    > diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
    > index 76ba8a1..9600a39 100644
    > --- a/drivers/pci/hotplug/cpqphp_nvram.c
    > +++ b/drivers/pci/hotplug/cpqphp_nvram.c
    > @@ -34,7 +34,6 @@
    > #include <linux/workqueue.h>
    > #include <linux/pci.h>
    > #include <linux/pci_hotplug.h>
    > -#include <linux/init.h>
    > #include <asm/uaccess.h>
    > #include "cpqphp.h"
    > #include "cpqphp_nvram.h"
    > diff --git a/drivers/pci/hotplug/s390_pci_hpc.c b/drivers/pci/hotplug/s390_pci_hpc.c
    > index 8d2ce22..d1332d2 100644
    > --- a/drivers/pci/hotplug/s390_pci_hpc.c
    > +++ b/drivers/pci/hotplug/s390_pci_hpc.c
    > @@ -15,7 +15,6 @@
    > #include <linux/slab.h>
    > #include <linux/pci.h>
    > #include <linux/pci_hotplug.h>
    > -#include <linux/init.h>
    > #include <asm/pci_debug.h>
    > #include <asm/sclp.h>
    >
    > diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
    > index 7a0fec6..18ca2497 100644
    > --- a/drivers/pci/msi.c
    > +++ b/drivers/pci/msi.c
    > @@ -10,7 +10,6 @@
    > #include <linux/mm.h>
    > #include <linux/irq.h>
    > #include <linux/interrupt.h>
    > -#include <linux/init.h>
    > #include <linux/export.h>
    > #include <linux/ioport.h>
    > #include <linux/pci.h>
    > diff --git a/drivers/pci/search.c b/drivers/pci/search.c
    > index 3ff2ac7..cc6db38 100644
    > --- a/drivers/pci/search.c
    > +++ b/drivers/pci/search.c
    > @@ -7,7 +7,6 @@
    > * Copyright (C) 2003 -- 2004 Greg Kroah-Hartman <greg@kroah.com>
    > */
    >
    > -#include <linux/init.h>
    > #include <linux/pci.h>
    > #include <linux/slab.h>
    > #include <linux/module.h>
    > diff --git a/drivers/pci/setup-irq.c b/drivers/pci/setup-irq.c
    > index 9bd6864..dbc4ffc 100644
    > --- a/drivers/pci/setup-irq.c
    > +++ b/drivers/pci/setup-irq.c
    > @@ -10,7 +10,6 @@
    > */
    >
    >
    > -#include <linux/init.h>
    > #include <linux/kernel.h>
    > #include <linux/pci.h>
    > #include <linux/errno.h>
    > diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
    > index 5c060b1..3e5682c 100644
    > --- a/drivers/pci/setup-res.c
    > +++ b/drivers/pci/setup-res.c
    > @@ -16,7 +16,6 @@
    > * Resource sorting
    > */
    >
    > -#include <linux/init.h>
    > #include <linux/kernel.h>
    > #include <linux/export.h>
    > #include <linux/pci.h>
    > --
    > 1.8.4.1
    >


    \
     
     \ /
      Last update: 2014-04-04 00:01    [W:2.541 / U:5.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site