svn commit: r323966 - in head/sys: arm/broadcom/bcm2835 arm/ti dev/sdhci
Ilya Bakulin
kibab at FreeBSD.org
Sun Sep 24 09:05:37 UTC 2017
Author: kibab
Date: Sun Sep 24 09:05:35 2017
New Revision: 323966
URL: https://svnweb.freebsd.org/changeset/base/323966
Log:
Rename sdhci_cam_start_slot() into sdhci_start_slot()
This change allows to just call sdhci_start_slot() in SDHCI drivers
and not to think about which stack handles the operation.
As a side effect, this will also fix MMCCAM with sdhci_acpi driver.
Approved by: imp (mentor)
Differential Revision: https://reviews.freebsd.org/D12471
Modified:
head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
head/sys/arm/ti/ti_sdhci.c
head/sys/dev/sdhci/fsl_sdhci.c
head/sys/dev/sdhci/sdhci.c
head/sys/dev/sdhci/sdhci.h
head/sys/dev/sdhci/sdhci_pci.c
Modified: head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c Sun Sep 24 05:04:06 2017 (r323965)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c Sun Sep 24 09:05:35 2017 (r323966)
@@ -255,11 +255,7 @@ bcm_sdhci_attach(device_t dev)
bus_generic_probe(dev);
bus_generic_attach(dev);
-#ifdef MMCCAM
- sdhci_cam_start_slot(&sc->sc_slot);
-#else
sdhci_start_slot(&sc->sc_slot);
-#endif
return (0);
Modified: head/sys/arm/ti/ti_sdhci.c
==============================================================================
--- head/sys/arm/ti/ti_sdhci.c Sun Sep 24 05:04:06 2017 (r323965)
+++ head/sys/arm/ti/ti_sdhci.c Sun Sep 24 09:05:35 2017 (r323966)
@@ -683,11 +683,7 @@ ti_sdhci_attach(device_t dev)
bus_generic_probe(dev);
bus_generic_attach(dev);
-#ifdef MMCCAM
- sdhci_cam_start_slot(&sc->slot);
-#else
sdhci_start_slot(&sc->slot);
-#endif
return (0);
fail:
Modified: head/sys/dev/sdhci/fsl_sdhci.c
==============================================================================
--- head/sys/dev/sdhci/fsl_sdhci.c Sun Sep 24 05:04:06 2017 (r323965)
+++ head/sys/dev/sdhci/fsl_sdhci.c Sun Sep 24 09:05:35 2017 (r323966)
@@ -913,11 +913,7 @@ fsl_sdhci_attach(device_t dev)
bus_generic_probe(dev);
bus_generic_attach(dev);
-#ifdef MMCCAM
- sdhci_cam_start_slot(&sc->slot);
-#else
sdhci_start_slot(&sc->slot);
-#endif
return (0);
Modified: head/sys/dev/sdhci/sdhci.c
==============================================================================
--- head/sys/dev/sdhci/sdhci.c Sun Sep 24 05:04:06 2017 (r323965)
+++ head/sys/dev/sdhci/sdhci.c Sun Sep 24 09:05:35 2017 (r323966)
@@ -1051,12 +1051,14 @@ no_tuning:
return (0);
}
+#ifndef MMCCAM
void
sdhci_start_slot(struct sdhci_slot *slot)
{
sdhci_card_task(slot, 0);
}
+#endif
int
sdhci_cleanup_slot(struct sdhci_slot *slot)
@@ -2383,7 +2385,7 @@ sdhci_generic_write_ivar(device_t bus, device_t child,
#ifdef MMCCAM
void
-sdhci_cam_start_slot(struct sdhci_slot *slot)
+sdhci_start_slot(struct sdhci_slot *slot)
{
if ((slot->devq = cam_simq_alloc(1)) == NULL) {
goto fail;
Modified: head/sys/dev/sdhci/sdhci.h
==============================================================================
--- head/sys/dev/sdhci/sdhci.h Sun Sep 24 05:04:06 2017 (r323965)
+++ head/sys/dev/sdhci/sdhci.h Sun Sep 24 09:05:35 2017 (r323966)
@@ -430,9 +430,4 @@ bool sdhci_generic_get_card_present(device_t brdev, st
void sdhci_generic_set_uhs_timing(device_t brdev, struct sdhci_slot *slot);
void sdhci_handle_card_present(struct sdhci_slot *slot, bool is_present);
-#ifdef MMCCAM
-/* CAM-related */
-void sdhci_cam_start_slot(struct sdhci_slot *slot);
-#endif
-
#endif /* __SDHCI_H__ */
Modified: head/sys/dev/sdhci/sdhci_pci.c
==============================================================================
--- head/sys/dev/sdhci/sdhci_pci.c Sun Sep 24 05:04:06 2017 (r323965)
+++ head/sys/dev/sdhci/sdhci_pci.c Sun Sep 24 09:05:35 2017 (r323966)
@@ -395,11 +395,7 @@ sdhci_pci_attach(device_t dev)
pci_enable_busmaster(dev);
/* Process cards detection. */
for (i = 0; i < sc->num_slots; i++) {
-#ifdef MMCCAM
- sdhci_cam_start_slot(&sc->slots[i]);
-#else
sdhci_start_slot(&sc->slots[i]);
-#endif
}
return (0);
More information about the svn-src-head
mailing list