tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

mmc: dw_mmc: move pmops into core driver

Since the platform power management structure is now shared with the PCI
front-end, there is a link failure if only the PCI variant is enabled:

arm-linux-gnueabi/bin/arm-linux-gnueabi-ld: drivers/mmc/host/dw_mmc-pci.o:(.data+0x74): undefined reference to `dw_mci_pltfm_pmops'

This could be fixed by selecting the platform driver from the PCI one
in Kconfig, or by reverting the change to the PCI driver, but since this
is now used by all dw_mmc variants, just move the structure into the core
code as well.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Arnd Bergmann and committed by
Ulf Hansson f3b9683b 4cd4e823

+6 -9
-9
drivers/mmc/host/dw_mmc-pltfm.c
··· 56 56 } 57 57 EXPORT_SYMBOL_GPL(dw_mci_pltfm_register); 58 58 59 - const struct dev_pm_ops dw_mci_pltfm_pmops = { 60 - SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, 61 - pm_runtime_force_resume) 62 - RUNTIME_PM_OPS(dw_mci_runtime_suspend, 63 - dw_mci_runtime_resume, 64 - NULL) 65 - }; 66 - EXPORT_SYMBOL_GPL(dw_mci_pltfm_pmops); 67 - 68 59 static int dw_mci_socfpga_priv_init(struct dw_mci *host) 69 60 { 70 61 struct device_node *np = host->dev->of_node;
+6
drivers/mmc/host/dw_mmc.c
··· 3523 3523 } 3524 3524 EXPORT_SYMBOL(dw_mci_runtime_resume); 3525 3525 3526 + const struct dev_pm_ops dw_mci_pltfm_pmops = { 3527 + SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, pm_runtime_force_resume) 3528 + RUNTIME_PM_OPS(dw_mci_runtime_suspend, dw_mci_runtime_resume, NULL) 3529 + }; 3530 + EXPORT_SYMBOL_GPL(dw_mci_pltfm_pmops); 3531 + 3526 3532 static int __init dw_mci_init(void) 3527 3533 { 3528 3534 pr_info("Synopsys Designware Multimedia Card Interface Driver\n");