| Message ID | 20210910211348.642103-2-mauro.lima@eclypsium.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | mtd: intel-spi: split read/write modes | expand |
On Fri, Sep 10, 2021 at 06:13:45PM -0300, Mauro Lima wrote: > Rename the files we want to split as base files. > Include the new files in intel-spi-{pci|platform}.c. > Change the intel-spi obj Makefile to be built with > intel-spi-base. I don't think this brings any benefits over the existing name. Furthermore if this needs to be done, -core.c would make more sense. IMHO.
diff --git a/drivers/mtd/spi-nor/controllers/Makefile b/drivers/mtd/spi-nor/controllers/Makefile index e7abba491d98..fa2dc480d2c8 100644 --- a/drivers/mtd/spi-nor/controllers/Makefile +++ b/drivers/mtd/spi-nor/controllers/Makefile @@ -3,5 +3,6 @@ obj-$(CONFIG_SPI_ASPEED_SMC) += aspeed-smc.o obj-$(CONFIG_SPI_HISI_SFC) += hisi-sfc.o obj-$(CONFIG_SPI_NXP_SPIFI) += nxp-spifi.o obj-$(CONFIG_SPI_INTEL_SPI) += intel-spi.o +intel-spi-y := intel-spi-base.o obj-$(CONFIG_SPI_INTEL_SPI_PCI) += intel-spi-pci.o obj-$(CONFIG_SPI_INTEL_SPI_PLATFORM) += intel-spi-platform.o diff --git a/drivers/mtd/spi-nor/controllers/intel-spi.c b/drivers/mtd/spi-nor/controllers/intel-spi-base.c similarity index 99% rename from drivers/mtd/spi-nor/controllers/intel-spi.c rename to drivers/mtd/spi-nor/controllers/intel-spi-base.c index a413892ff449..362fb41b969e 100644 --- a/drivers/mtd/spi-nor/controllers/intel-spi.c +++ b/drivers/mtd/spi-nor/controllers/intel-spi-base.c @@ -16,7 +16,7 @@ #include <linux/mtd/partitions.h> #include <linux/mtd/spi-nor.h> -#include "intel-spi.h" +#include "intel-spi-base.h" /* Offsets are from @ispi->base */ #define BFPREG 0x00 diff --git a/drivers/mtd/spi-nor/controllers/intel-spi.h b/drivers/mtd/spi-nor/controllers/intel-spi-base.h similarity index 100% rename from drivers/mtd/spi-nor/controllers/intel-spi.h rename to drivers/mtd/spi-nor/controllers/intel-spi-base.h diff --git a/drivers/mtd/spi-nor/controllers/intel-spi-pci.c b/drivers/mtd/spi-nor/controllers/intel-spi-pci.c index 1bc53b8bb88a..46db2743e244 100644 --- a/drivers/mtd/spi-nor/controllers/intel-spi-pci.c +++ b/drivers/mtd/spi-nor/controllers/intel-spi-pci.c @@ -11,7 +11,7 @@ #include <linux/module.h> #include <linux/pci.h> -#include "intel-spi.h" +#include "intel-spi-base.h" #define BCR 0xdc #define BCR_WPD BIT(0) diff --git a/drivers/mtd/spi-nor/controllers/intel-spi-platform.c b/drivers/mtd/spi-nor/controllers/intel-spi-platform.c index f80f1086f928..5d6b6125c4b5 100644 --- a/drivers/mtd/spi-nor/controllers/intel-spi-platform.c +++ b/drivers/mtd/spi-nor/controllers/intel-spi-platform.c @@ -10,7 +10,7 @@ #include <linux/module.h> #include <linux/platform_device.h> -#include "intel-spi.h" +#include "intel-spi-base.h" static int intel_spi_platform_probe(struct platform_device *pdev) {
Rename the files we want to split as base files. Include the new files in intel-spi-{pci|platform}.c. Change the intel-spi obj Makefile to be built with intel-spi-base. Suggested-by: Daniel Gutson <daniel.gutson@eclypsium.com> Suggested-by: Richard Hughes <richard@hughsie.com> Signed-off-by: Mauro Lima <mauro.lima@eclypsium.com> --- drivers/mtd/spi-nor/controllers/Makefile | 1 + .../mtd/spi-nor/controllers/{intel-spi.c => intel-spi-base.c} | 2 +- .../mtd/spi-nor/controllers/{intel-spi.h => intel-spi-base.h} | 0 drivers/mtd/spi-nor/controllers/intel-spi-pci.c | 2 +- drivers/mtd/spi-nor/controllers/intel-spi-platform.c | 2 +- 5 files changed, 4 insertions(+), 3 deletions(-) rename drivers/mtd/spi-nor/controllers/{intel-spi.c => intel-spi-base.c} (99%) rename drivers/mtd/spi-nor/controllers/{intel-spi.h => intel-spi-base.h} (100%)