Skip to content

Commit

Permalink
powerpc: clean the inclusion of stringify.h
Browse files Browse the repository at this point in the history
Only include linux/stringify.h is files using __stringify()

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Christophe Leroy authored and Michael Ellerman committed Jul 30, 2018
1 parent ec0c464 commit 5c35a02
Show file tree
Hide file tree
Showing 15 changed files with 11 additions and 6 deletions.
1 change: 1 addition & 0 deletions arch/powerpc/include/asm/dcr-native.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <linux/spinlock.h>
#include <asm/cputable.h>
#include <asm/cpu_has_feature.h>
#include <linux/stringify.h>

typedef struct {
unsigned int base;
Expand Down
1 change: 0 additions & 1 deletion arch/powerpc/include/asm/ppc-opcode.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#ifndef _ASM_POWERPC_PPC_OPCODE_H
#define _ASM_POWERPC_PPC_OPCODE_H

#include <linux/stringify.h>
#include <asm/asm-const.h>

#define __REG_R0 0
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/include/asm/reg_fsl_emb.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#ifndef __ASM_POWERPC_REG_FSL_EMB_H__
#define __ASM_POWERPC_REG_FSL_EMB_H__

#include <linux/stringify.h>

#ifndef __ASSEMBLY__
/* Performance Monitor Registers */
#define mfpmr(rn) ({unsigned int rval; \
Expand Down
1 change: 0 additions & 1 deletion arch/powerpc/include/asm/synch.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#define _ASM_POWERPC_SYNCH_H
#ifdef __KERNEL__

#include <linux/stringify.h>
#include <asm/feature-fixups.h>
#include <asm/asm-const.h>

Expand Down
1 change: 0 additions & 1 deletion arch/powerpc/include/asm/thread_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <linux/cache.h>
#include <asm/processor.h>
#include <asm/page.h>
#include <linux/stringify.h>
#include <asm/accounting.h>

/*
Expand Down
1 change: 0 additions & 1 deletion arch/powerpc/kernel/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <linux/spinlock.h>
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/stringify.h>
#include <linux/delay.h>
#include <linux/initrd.h>
#include <linux/bitops.h>
Expand Down
1 change: 0 additions & 1 deletion arch/powerpc/kernel/prom_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <linux/types.h>
#include <linux/pci.h>
#include <linux/proc_fs.h>
#include <linux/stringify.h>
#include <linux/delay.h>
#include <linux/initrd.h>
#include <linux/bitops.h>
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/kvm/book3s_64_vio_hv.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <linux/slab.h>
#include <linux/hugetlb.h>
#include <linux/list.h>
#include <linux/stringify.h>

#include <asm/tlbflush.h>
#include <asm/kvm_ppc.h>
Expand Down
1 change: 0 additions & 1 deletion arch/powerpc/lib/locks.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/spinlock.h>
#include <linux/export.h>
#include <linux/stringify.h>
#include <linux/smp.h>

/* waiting for a spinlock... */
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/perf/req-gen/_begin.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#ifndef POWERPC_PERF_REQ_GEN_H_
#define POWERPC_PERF_REQ_GEN_H_

#include <linux/stringify.h>

#define CAT2_STR_(t, s) __stringify(t/s)
#define CAT2_STR(t, s) CAT2_STR_(t, s)
#define I(...) __VA_ARGS__
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/perf/req-gen/perf.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#define LINUX_POWERPC_PERF_REQ_GEN_PERF_H_

#include <linux/perf_event.h>
#include <linux/stringify.h>

#ifndef REQUEST_FILE
#error "REQUEST_FILE must be defined before including"
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/platforms/cell/cbe_thermal.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
#include <linux/device.h>
#include <linux/kernel.h>
#include <linux/cpu.h>
#include <linux/stringify.h>
#include <asm/spu.h>
#include <asm/io.h>
#include <asm/prom.h>
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/platforms/cell/spufs/sputrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#define _TRACE_SPUFS_H

#include <linux/tracepoint.h>
#include <linux/stringify.h>

#undef TRACE_SYSTEM
#define TRACE_SYSTEM spufs
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/platforms/powernv/vas.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <linux/io.h>
#include <linux/dcache.h>
#include <linux/mutex.h>
#include <linux/stringify.h>

/*
* Overview of Virtual Accelerator Switchboard (VAS).
Expand Down
1 change: 1 addition & 0 deletions arch/powerpc/platforms/pseries/mobility.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <linux/device.h>
#include <linux/delay.h>
#include <linux/slab.h>
#include <linux/stringify.h>

#include <asm/machdep.h>
#include <asm/rtas.h>
Expand Down

0 comments on commit 5c35a02

Please sign in to comment.