Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 659c9bc1 authored by Ben Hutchings's avatar Ben Hutchings Committed by Ulf Hansson
Browse files

mmc: sdhci-pci: Build o2micro support in the same module 



sdhci-pci-o2micro.c contains no initialisation and its functions are only
called from shdci-pci.c, so there is no reason for it to be a separate
module, let alone or for it to always be built-in.

- Rename sdhci-pci.c to sdhci-pci-core.c so that the sdhci-pci module
  can be built from multiple source files
- Add sdhci-pci-o2micro.c to it
- Remove redundant exports

Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 0de9125f

drivers/mmc/host/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ obj-$(CONFIG_MMC_MXC) += mxcmmc.o 
obj-$(CONFIG_MMC_MXS)		+= mxs-mmc.o

obj-$(CONFIG_MMC_SDHCI)		+= sdhci.o

obj-$(CONFIG_MMC_SDHCI_PCI)	+= sdhci-pci.o

sdhci-pci-y			+= sdhci-pci-core.o sdhci-pci-o2micro.o

obj-$(subst m,y,$(CONFIG_MMC_SDHCI_PCI))	+= sdhci-pci-data.o

obj-$(subst m,y,$(CONFIG_MMC_SDHCI_PCI))	+= sdhci-pci-o2micro.o

obj-$(CONFIG_MMC_SDHCI_ACPI)	+= sdhci-acpi.o

obj-$(CONFIG_MMC_SDHCI_PXAV3)	+= sdhci-pxav3.o

obj-$(CONFIG_MMC_SDHCI_PXAV2)	+= sdhci-pxav2.o

drivers/mmc/host/sdhci-pci-o2micro.c

+0 −4
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ void sdhci_pci_o2_fujin2_pci_init(struct sdhci_pci_chip *chip) 
	scratch_32 |= 0x00080000;

	pci_write_config_dword(chip->pdev, O2_SD_MISC_CTRL4, scratch_32);

}

EXPORT_SYMBOL_GPL(sdhci_pci_o2_fujin2_pci_init);



int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot)

{
@@ -179,7 +178,6 @@ int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot) 


	return 0;

}

EXPORT_SYMBOL_GPL(sdhci_pci_o2_probe_slot);



int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip)

{
@@ -385,11 +383,9 @@ int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip) 


	return 0;

}

EXPORT_SYMBOL_GPL(sdhci_pci_o2_probe);



int sdhci_pci_o2_resume(struct sdhci_pci_chip *chip)

{

	sdhci_pci_o2_probe(chip);

	return 0;

}
 
EXPORT_SYMBOL_GPL(sdhci_pci_o2_resume);