Message ID | 20210304140820.56692-1-andriy.shevchenko@linux.intel.com |
---|---|
State | Accepted |
Delegated to: | Ambarus Tudor |
Headers | show |
Series | [v1,1/1] mtd: spi-nor: intel-spi: Move platform data header to x85 subfolder | expand |
On 3/4/21 7:38 PM, Andy Shevchenko wrote: > In order to group x86 related platform data move intel-spi.h to x85 folder. > > While at it, remove duplicate inclusion in C file. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- Nit, typo in $subject and commit message: s/x85/x86. Tudor may be able to fix it locally while applying. Apart from that Reviewed-by: Vignesh Raghavendra <vigneshr@ti.com> Regards Vignesh > drivers/mtd/spi-nor/controllers/intel-spi.c | 1 - > drivers/mtd/spi-nor/controllers/intel-spi.h | 2 +- > include/linux/mfd/lpc_ich.h | 2 +- > include/linux/platform_data/{ => x86}/intel-spi.h | 0 > 4 files changed, 2 insertions(+), 3 deletions(-) > rename include/linux/platform_data/{ => x86}/intel-spi.h (100%) > > diff --git a/drivers/mtd/spi-nor/controllers/intel-spi.c b/drivers/mtd/spi-nor/controllers/intel-spi.c > index b54a56a68100..a413892ff449 100644 > --- a/drivers/mtd/spi-nor/controllers/intel-spi.c > +++ b/drivers/mtd/spi-nor/controllers/intel-spi.c > @@ -15,7 +15,6 @@ > #include <linux/mtd/mtd.h> > #include <linux/mtd/partitions.h> > #include <linux/mtd/spi-nor.h> > -#include <linux/platform_data/intel-spi.h> > > #include "intel-spi.h" > > diff --git a/drivers/mtd/spi-nor/controllers/intel-spi.h b/drivers/mtd/spi-nor/controllers/intel-spi.h > index e2f41b8827bf..f2871179fd34 100644 > --- a/drivers/mtd/spi-nor/controllers/intel-spi.h > +++ b/drivers/mtd/spi-nor/controllers/intel-spi.h > @@ -9,7 +9,7 @@ > #ifndef INTEL_SPI_H > #define INTEL_SPI_H > > -#include <linux/platform_data/intel-spi.h> > +#include <linux/platform_data/x86/intel-spi.h> > > struct intel_spi; > struct resource; > diff --git a/include/linux/mfd/lpc_ich.h b/include/linux/mfd/lpc_ich.h > index 6ddca2bbb3a8..39967a5eca6d 100644 > --- a/include/linux/mfd/lpc_ich.h > +++ b/include/linux/mfd/lpc_ich.h > @@ -8,7 +8,7 @@ > #ifndef LPC_ICH_H > #define LPC_ICH_H > > -#include <linux/platform_data/intel-spi.h> > +#include <linux/platform_data/x86/intel-spi.h> > > /* GPIO resources */ > #define ICH_RES_GPIO 0 > diff --git a/include/linux/platform_data/intel-spi.h b/include/linux/platform_data/x86/intel-spi.h > similarity index 100% > rename from include/linux/platform_data/intel-spi.h > rename to include/linux/platform_data/x86/intel-spi.h >
On Thu, 4 Mar 2021 16:08:20 +0200, Andy Shevchenko wrote: > In order to group x86 related platform data move intel-spi.h to x85 folder. > > While at it, remove duplicate inclusion in C file. s/x85/x86 in subject and commit description and applied to spi-nor/next. Thanks! [1/1] mtd: spi-nor: intel-spi: Move platform data header to x85 subfolder https://git.kernel.org/mtd/c/ae2177cf318d Best regards,
diff --git a/drivers/mtd/spi-nor/controllers/intel-spi.c b/drivers/mtd/spi-nor/controllers/intel-spi.c index b54a56a68100..a413892ff449 100644 --- a/drivers/mtd/spi-nor/controllers/intel-spi.c +++ b/drivers/mtd/spi-nor/controllers/intel-spi.c @@ -15,7 +15,6 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> #include <linux/mtd/spi-nor.h> -#include <linux/platform_data/intel-spi.h> #include "intel-spi.h" diff --git a/drivers/mtd/spi-nor/controllers/intel-spi.h b/drivers/mtd/spi-nor/controllers/intel-spi.h index e2f41b8827bf..f2871179fd34 100644 --- a/drivers/mtd/spi-nor/controllers/intel-spi.h +++ b/drivers/mtd/spi-nor/controllers/intel-spi.h @@ -9,7 +9,7 @@ #ifndef INTEL_SPI_H #define INTEL_SPI_H -#include <linux/platform_data/intel-spi.h> +#include <linux/platform_data/x86/intel-spi.h> struct intel_spi; struct resource; diff --git a/include/linux/mfd/lpc_ich.h b/include/linux/mfd/lpc_ich.h index 6ddca2bbb3a8..39967a5eca6d 100644 --- a/include/linux/mfd/lpc_ich.h +++ b/include/linux/mfd/lpc_ich.h @@ -8,7 +8,7 @@ #ifndef LPC_ICH_H #define LPC_ICH_H -#include <linux/platform_data/intel-spi.h> +#include <linux/platform_data/x86/intel-spi.h> /* GPIO resources */ #define ICH_RES_GPIO 0 diff --git a/include/linux/platform_data/intel-spi.h b/include/linux/platform_data/x86/intel-spi.h similarity index 100% rename from include/linux/platform_data/intel-spi.h rename to include/linux/platform_data/x86/intel-spi.h
In order to group x86 related platform data move intel-spi.h to x85 folder. While at it, remove duplicate inclusion in C file. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/mtd/spi-nor/controllers/intel-spi.c | 1 - drivers/mtd/spi-nor/controllers/intel-spi.h | 2 +- include/linux/mfd/lpc_ich.h | 2 +- include/linux/platform_data/{ => x86}/intel-spi.h | 0 4 files changed, 2 insertions(+), 3 deletions(-) rename include/linux/platform_data/{ => x86}/intel-spi.h (100%)