On 15/04/2019 21:31, Arnd Bergmann wrote: > gpio-ep93xx.h, hardware.h, and platform.h are only used in > arch/arm/mach-ep93xx, so we can move them one there and no > longer expose them to device drivers.
Acked-by: Alexander Sverdlin <[email protected]> > Signed-off-by: Arnd Bergmann <[email protected]> > --- > arch/arm/mach-ep93xx/adssphere.c | 2 +- > arch/arm/mach-ep93xx/clock.c | 2 +- > arch/arm/mach-ep93xx/core.c | 6 +++--- > arch/arm/mach-ep93xx/dma.c | 2 +- > arch/arm/mach-ep93xx/edb93xx.c | 4 ++-- > arch/arm/mach-ep93xx/gesbc9312.c | 2 +- > arch/arm/mach-ep93xx/{include/mach => }/gpio-ep93xx.h | 0 > arch/arm/mach-ep93xx/{include/mach => }/hardware.h | 2 +- > arch/arm/mach-ep93xx/micro9.c | 2 +- > arch/arm/mach-ep93xx/{include/mach => }/platform.h | 0 > arch/arm/mach-ep93xx/simone.c | 4 ++-- > arch/arm/mach-ep93xx/snappercl15.c | 4 ++-- > arch/arm/mach-ep93xx/ts72xx.c | 4 ++-- > arch/arm/mach-ep93xx/vision_ep9307.c | 4 ++-- > 14 files changed, 19 insertions(+), 19 deletions(-) > rename arch/arm/mach-ep93xx/{include/mach => }/gpio-ep93xx.h (100%) > rename arch/arm/mach-ep93xx/{include/mach => }/hardware.h (96%) > rename arch/arm/mach-ep93xx/{include/mach => }/platform.h (100%) > > diff --git a/arch/arm/mach-ep93xx/adssphere.c > b/arch/arm/mach-ep93xx/adssphere.c > index bda6c3a5c923..5d3a3e302012 100644 > --- a/arch/arm/mach-ep93xx/adssphere.c > +++ b/arch/arm/mach-ep93xx/adssphere.c > @@ -15,7 +15,7 @@ > #include <linux/platform_device.h> > #include <linux/sizes.h> > > -#include <mach/hardware.h> > +#include "hardware.h" > > #include <asm/mach-types.h> > #include <asm/mach/arch.h> > diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c > index 9f43362eb62d..b9f523d9dc8c 100644 > --- a/arch/arm/mach-ep93xx/clock.c > +++ b/arch/arm/mach-ep93xx/clock.c > @@ -22,7 +22,7 @@ > #include <linux/clkdev.h> > #include <linux/soc/cirrus/ep93xx.h> > > -#include <mach/hardware.h> > +#include "hardware.h" > > #include <asm/div64.h> > > diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c > index 3d245668846d..cc1382f879af 100644 > --- a/arch/arm/mach-ep93xx/core.c > +++ b/arch/arm/mach-ep93xx/core.c > @@ -39,13 +39,13 @@ > #include <linux/usb/ohci_pdriver.h> > #include <linux/random.h> > > -#include <mach/hardware.h> > +#include "hardware.h" > #include <linux/platform_data/video-ep93xx.h> > #include <linux/platform_data/keypad-ep93xx.h> > #include <linux/platform_data/spi-ep93xx.h> > #include <linux/soc/cirrus/ep93xx.h> > > -#include <mach/gpio-ep93xx.h> > +#include "gpio-ep93xx.h" > > #include <asm/mach/arch.h> > #include <asm/mach/map.h> > @@ -125,7 +125,7 @@ void ep93xx_devcfg_set_clear(unsigned int set_bits, > unsigned int clear_bits) > /** > * ep93xx_chip_revision() - returns the EP93xx chip revision > * > - * See <mach/platform.h> for more information. > + * See "platform.h" for more information. > */ > unsigned int ep93xx_chip_revision(void) > { > diff --git a/arch/arm/mach-ep93xx/dma.c b/arch/arm/mach-ep93xx/dma.c > index 88a4c9b089a5..821427107b11 100644 > --- a/arch/arm/mach-ep93xx/dma.c > +++ b/arch/arm/mach-ep93xx/dma.c > @@ -26,7 +26,7 @@ > #include <linux/platform_device.h> > > #include <linux/platform_data/dma-ep93xx.h> > -#include <mach/hardware.h> > +#include "hardware.h" > > #include "soc.h" > > diff --git a/arch/arm/mach-ep93xx/edb93xx.c b/arch/arm/mach-ep93xx/edb93xx.c > index 8e89ec8b6f0f..d96dd014dd23 100644 > --- a/arch/arm/mach-ep93xx/edb93xx.c > +++ b/arch/arm/mach-ep93xx/edb93xx.c > @@ -32,10 +32,10 @@ > > #include <sound/cs4271.h> > > -#include <mach/hardware.h> > +#include "hardware.h" > #include <linux/platform_data/video-ep93xx.h> > #include <linux/platform_data/spi-ep93xx.h> > -#include <mach/gpio-ep93xx.h> > +#include "gpio-ep93xx.h" > > #include <asm/mach-types.h> > #include <asm/mach/arch.h> > diff --git a/arch/arm/mach-ep93xx/gesbc9312.c > b/arch/arm/mach-ep93xx/gesbc9312.c > index 0cca5b183309..ac48e3476587 100644 > --- a/arch/arm/mach-ep93xx/gesbc9312.c > +++ b/arch/arm/mach-ep93xx/gesbc9312.c > @@ -15,7 +15,7 @@ > #include <linux/platform_device.h> > #include <linux/sizes.h> > > -#include <mach/hardware.h> > +#include "hardware.h" > > #include <asm/mach-types.h> > #include <asm/mach/arch.h> > diff --git a/arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h > b/arch/arm/mach-ep93xx/gpio-ep93xx.h > similarity index 100% > rename from arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h > rename to arch/arm/mach-ep93xx/gpio-ep93xx.h > diff --git a/arch/arm/mach-ep93xx/include/mach/hardware.h > b/arch/arm/mach-ep93xx/hardware.h > similarity index 96% > rename from arch/arm/mach-ep93xx/include/mach/hardware.h > rename to arch/arm/mach-ep93xx/hardware.h > index 8938906e780a..e7d850e04782 100644 > --- a/arch/arm/mach-ep93xx/include/mach/hardware.h > +++ b/arch/arm/mach-ep93xx/hardware.h > @@ -6,7 +6,7 @@ > #ifndef __ASM_ARCH_HARDWARE_H > #define __ASM_ARCH_HARDWARE_H > > -#include <mach/platform.h> > +#include "platform.h" > > /* > * The EP93xx has two external crystal oscillators. To generate the > diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c > index 373583c29825..c7f64e4ff6c7 100644 > --- a/arch/arm/mach-ep93xx/micro9.c > +++ b/arch/arm/mach-ep93xx/micro9.c > @@ -16,7 +16,7 @@ > #include <linux/platform_device.h> > #include <linux/io.h> > > -#include <mach/hardware.h> > +#include "hardware.h" > > #include <asm/mach-types.h> > #include <asm/mach/arch.h> > diff --git a/arch/arm/mach-ep93xx/include/mach/platform.h > b/arch/arm/mach-ep93xx/platform.h > similarity index 100% > rename from arch/arm/mach-ep93xx/include/mach/platform.h > rename to arch/arm/mach-ep93xx/platform.h > diff --git a/arch/arm/mach-ep93xx/simone.c b/arch/arm/mach-ep93xx/simone.c > index 80ccb984d521..adc17289cc23 100644 > --- a/arch/arm/mach-ep93xx/simone.c > +++ b/arch/arm/mach-ep93xx/simone.c > @@ -27,8 +27,8 @@ > #include <linux/gpio.h> > #include <linux/gpio/machine.h> > > -#include <mach/hardware.h> > -#include <mach/gpio-ep93xx.h> > +#include "hardware.h" > +#include "gpio-ep93xx.h" > > #include <asm/mach-types.h> > #include <asm/mach/arch.h> > diff --git a/arch/arm/mach-ep93xx/snappercl15.c > b/arch/arm/mach-ep93xx/snappercl15.c > index cf0cb58b3454..f8f89551dbed 100644 > --- a/arch/arm/mach-ep93xx/snappercl15.c > +++ b/arch/arm/mach-ep93xx/snappercl15.c > @@ -25,9 +25,9 @@ > > #include <linux/mtd/platnand.h> > > -#include <mach/hardware.h> > +#include "hardware.h" > #include <linux/platform_data/video-ep93xx.h> > -#include <mach/gpio-ep93xx.h> > +#include "gpio-ep93xx.h" > > #include <asm/mach-types.h> > #include <asm/mach/arch.h> > diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c > index 85b74ac943f0..bba6aa5d7106 100644 > --- a/arch/arm/mach-ep93xx/ts72xx.c > +++ b/arch/arm/mach-ep93xx/ts72xx.c > @@ -23,8 +23,8 @@ > #include <linux/mmc/host.h> > #include <linux/platform_data/spi-ep93xx.h> > > -#include <mach/gpio-ep93xx.h> > -#include <mach/hardware.h> > +#include "gpio-ep93xx.h" > +#include "hardware.h" > #include <mach/irqs.h> > > #include <asm/mach-types.h> > diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c > b/arch/arm/mach-ep93xx/vision_ep9307.c > index 767ee64628dc..66e2b34aa779 100644 > --- a/arch/arm/mach-ep93xx/vision_ep9307.c > +++ b/arch/arm/mach-ep93xx/vision_ep9307.c > @@ -31,10 +31,10 @@ > > #include <sound/cs4271.h> > > -#include <mach/hardware.h> > +#include "hardware.h" > #include <linux/platform_data/video-ep93xx.h> > #include <linux/platform_data/spi-ep93xx.h> > -#include <mach/gpio-ep93xx.h> > +#include "gpio-ep93xx.h" > > #include <asm/mach-types.h> > #include <asm/mach/map.h> >
