diff options
| author | Linus Torvalds | 2017-05-24 08:21:56 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2017-05-24 08:21:56 -0700 |
| commit | 590d4b333d12cbf85dae37257d81960a280232df (patch) | |
| tree | ae87599e93d935a96acf88e95df601524af47735 /include | |
| parent | 56fff1bb0f31358bf81a3c64a8dcd6da0dc44263 (diff) | |
| parent | f5f968f2371ccdebb8a365487649673c9af68d09 (diff) | |
Merge tag 'mmc-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC fixes from Ulf Hansson:
"A couple of MMC host fixes intended for v4.12 rc3:
- sdhci-xenon: Don't free data for phy allocated by devm*
- sdhci-iproc: Suppress spurious interrupts
- cavium: Fix probing race with regulator
- cavium: Prevent crash with incomplete DT
- cavium-octeon: Use proper GPIO name for power control
- cavium-octeon: Fix interrupt enable code"
* tag 'mmc-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
mmc: sdhci-iproc: suppress spurious interrupt with Multiblock read
mmc: cavium: Fix probing race with regulator
of/platform: Make of_platform_device_destroy globally visible
mmc: cavium: Prevent crash with incomplete DT
mmc: cavium-octeon: Use proper GPIO name for power control
mmc: cavium-octeon: Fix interrupt enable code
mmc: sdhci-xenon: kill xenon_clean_phy()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/of_platform.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h index dc8224ae28d5..e0d1946270f3 100644 --- a/include/linux/of_platform.h +++ b/include/linux/of_platform.h @@ -64,6 +64,7 @@ extern struct platform_device *of_platform_device_create(struct device_node *np, const char *bus_id, struct device *parent); +extern int of_platform_device_destroy(struct device *dev, void *data); extern int of_platform_bus_probe(struct device_node *root, const struct of_device_id *matches, struct device *parent); |