[PATCH 0/4] printk: cleanups of direct includes

[PATCH 0/4] printk: cleanups of direct includes

[Joe Perches]

printk.h is a subfile of kernel.h, do not allow it to
be included directly.

Joe Perches (4):
  treewide: Remove direct includes of printk.h
  staging: Remove direct includes of printk.h
  printk: Don't allow direct inclusion
  treewide: Remove asmlinkage from printk

 arch/arm/kernel/early_printk.c                |    2 +-
 arch/ia64/kvm/vmm.c                           |    2 +-
 arch/x86/kernel/early_printk.c                |    2 +-
 drivers/staging/brcm80211/brcmfmac/dhd_sdio.c |    1 -
 drivers/staging/brcm80211/util/bcmutils.c     |    1 -
 drivers/staging/usbip/usbip_common.h          |    2 +-
 fs/ext4/inode.c                               |    1 -
 include/linux/oprofile.h                      |    2 +-
 include/linux/printk.h                        |   10 +++++++---
 kernel/printk.c                               |    6 +++---
 kernel/sysctl.c                               |    3 +--
 11 files changed, 16 insertions(+), 16 deletions(-)

-- 
1.7.4.rc3

[PATCH 2/4] staging: Remove direct includes of printk.h

[Joe Perches]

Make the uses kernel.h instead.

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/staging/brcm80211/brcmfmac/dhd_sdio.c |    1 -
 drivers/staging/brcm80211/util/bcmutils.c     |    1 -
 drivers/staging/usbip/usbip_common.h          |    2 +-
 3 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index a71c6f8..b00029a 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -16,7 +16,6 @@
 
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/printk.h>
 #include <linux/pci_ids.h>
 #include <linux/netdevice.h>
 #include <bcmdefs.h>
diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c
index 43e5bb3..1c8b6c6 100644
--- a/drivers/staging/brcm80211/util/bcmutils.c
+++ b/drivers/staging/brcm80211/util/bcmutils.c
@@ -21,7 +21,6 @@
 #include <linux/pci.h>
 #include <linux/netdevice.h>
 #include <linux/sched.h>
-#include <linux/printk.h>
 #include <bcmdefs.h>
 #include <stdarg.h>
 #include <bcmutils.h>
diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
index 4a641c5..0f9176d 100644
--- a/drivers/staging/usbip/usbip_common.h
+++ b/drivers/staging/usbip/usbip_common.h
@@ -24,7 +24,7 @@
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/net.h>
-#include <linux/printk.h>
+#include <linux/kernel.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
 #include <linux/usb.h>
-- 
1.7.4.rc3

Re: [PATCH 2/4] staging: Remove direct includes of printk.h

[Roland Vossen]

On 05/25/2011 07:02 PM, Joe Perches wrote:
> Make the uses kernel.h instead.
>
> Signed-off-by: Joe Perches<joe@perches.com>

Acked-by: Roland Vossen <rvossen@broadcom.com>

Re: [PATCH 2/4] staging: Remove direct includes of printk.h

[julie Sullivan]

> --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
> +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
> @@ -16,7 +16,6 @@
>
>  #include <linux/types.h>
>  #include <linux/kernel.h>
> -#include <linux/printk.h>


> --- a/drivers/staging/usbip/usbip_common.h
> +++ b/drivers/staging/usbip/usbip_common.h
> @@ -24,7 +24,7 @@
>  #include <linux/device.h>
>  #include <linux/interrupt.h>
>  #include <linux/net.h>
> -#include <linux/printk.h>
> +#include <linux/kernel.h>
>  #include <linux/spinlock.h>
>  #include <linux/types.h>

types.h is also a subfile of kernel.h, right?
Or maybe you patched this one already - if so please excuse the noise :-)

Cheers
Julie

Re: [PATCH 2/4] staging: Remove direct includes of printk.h

[Joe Perches]

On Sun, 2011-05-29 at 18:00 +0100, julie Sullivan wrote: 
> > --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
[] 
> types.h is also a subfile of kernel.h, right?

Yes it is.

> Or maybe you patched this one already - if so please excuse the noise :-)

No I didn't patch that one.

I think it wouldn't be good to do that.
printk.h may be a special case because it was
moved out of kernel.h just to make it a bit neater.

You are welcome to if you choose to.

There are like 1500 or so files that have both kernel.h and types.h

$ grep --include=*.[ch] -rP -l "^\s*\#\s*include\s+\<linux/types\.h>" * | \
  xargs grep -Pl "^\s*\#\s*include\s+\<linux/kernel\.h\>" | wc -l
1572