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

Commit 11da3764 authored Dec 20, 2011 by Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  mmc: vub300: fix type of firmware_rom_wait_states module parameter
  Revert "mmc: enable runtime PM by default"
  mmc: sdhci: remove "state" argument from sdhci_suspend_host

parents 50345f1e 61074287

drivers/mmc/core/host.c

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -302,17 +302,6 @@ struct mmc_host mmc_alloc_host(int extra, struct device dev)
	host->max_blk_size = 512;		host->max_blk_size = 512;
	host->max_blk_count = PAGE_CACHE_SIZE / 512;		host->max_blk_count = PAGE_CACHE_SIZE / 512;

	/*
	* Enable runtime power management by default. This flag was added due
	* to runtime power management causing disruption for some users, but
	* the power on/off code has been improved since then.
	*
	* We'll enable this flag by default as an experiment, and if no
	* problems are reported, we will follow up later and remove the flag
	* altogether.
	*/
	host->caps = MMC_CAP_POWER_OFF_CARD;

	return host;		return host;

	free:		free:

drivers/mmc/host/sdhci-cns3xxx.c

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -109,13 +109,10 @@ static struct platform_driver sdhci_cns3xxx_driver = {
	.driver = {		.driver = {
	.name = "sdhci-cns3xxx",		.name = "sdhci-cns3xxx",
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
			.pm = SDHCI_PLTFM_PMOPS,
	},		},
	.probe = sdhci_cns3xxx_probe,		.probe = sdhci_cns3xxx_probe,
	.remove = __devexit_p(sdhci_cns3xxx_remove),		.remove = __devexit_p(sdhci_cns3xxx_remove),
	#ifdef CONFIG_PM
	.suspend = sdhci_pltfm_suspend,
	.resume = sdhci_pltfm_resume,
	#endif
	};		};

	static int __init sdhci_cns3xxx_init(void)		static int __init sdhci_cns3xxx_init(void)

drivers/mmc/host/sdhci-dove.c

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -82,13 +82,10 @@ static struct platform_driver sdhci_dove_driver = {
	.driver = {		.driver = {
	.name = "sdhci-dove",		.name = "sdhci-dove",
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
			.pm = SDHCI_PLTFM_PMOPS,
	},		},
	.probe = sdhci_dove_probe,		.probe = sdhci_dove_probe,
	.remove = __devexit_p(sdhci_dove_remove),		.remove = __devexit_p(sdhci_dove_remove),
	#ifdef CONFIG_PM
	.suspend = sdhci_pltfm_suspend,
	.resume = sdhci_pltfm_resume,
	#endif
	};		};

	static int __init sdhci_dove_init(void)		static int __init sdhci_dove_init(void)

drivers/mmc/host/sdhci-esdhc-imx.c

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -599,14 +599,11 @@ static struct platform_driver sdhci_esdhc_imx_driver = {
	.name = "sdhci-esdhc-imx",		.name = "sdhci-esdhc-imx",
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.of_match_table = imx_esdhc_dt_ids,		.of_match_table = imx_esdhc_dt_ids,
			.pm = SDHCI_PLTFM_PMOPS,
	},		},
	.id_table = imx_esdhc_devtype,		.id_table = imx_esdhc_devtype,
	.probe = sdhci_esdhc_imx_probe,		.probe = sdhci_esdhc_imx_probe,
	.remove = __devexit_p(sdhci_esdhc_imx_remove),		.remove = __devexit_p(sdhci_esdhc_imx_remove),
	#ifdef CONFIG_PM
	.suspend = sdhci_pltfm_suspend,
	.resume = sdhci_pltfm_resume,
	#endif
	};		};

	static int __init sdhci_esdhc_imx_init(void)		static int __init sdhci_esdhc_imx_init(void)

drivers/mmc/host/sdhci-of-esdhc.c

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -125,13 +125,10 @@ static struct platform_driver sdhci_esdhc_driver = {
	.name = "sdhci-esdhc",		.name = "sdhci-esdhc",
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.of_match_table = sdhci_esdhc_of_match,		.of_match_table = sdhci_esdhc_of_match,
			.pm = SDHCI_PLTFM_PMOPS,
	},		},
	.probe = sdhci_esdhc_probe,		.probe = sdhci_esdhc_probe,
	.remove = __devexit_p(sdhci_esdhc_remove),		.remove = __devexit_p(sdhci_esdhc_remove),
	#ifdef CONFIG_PM
	.suspend = sdhci_pltfm_suspend,
	.resume = sdhci_pltfm_resume,
	#endif
	};		};

	static int __init sdhci_esdhc_init(void)		static int __init sdhci_esdhc_init(void)