d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename sdhci_cam_start_slot() into sdhci_start_slot()

Browse Source 
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
This commit is contained in:
Ilya Bakulin 2017-09-24 09:05:35 +00:00
parent d12420d872
commit d91f1a1094
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=323966
6 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
View File

@ -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);

4
sys/arm/ti/ti_sdhci.c
View File

@ -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:

4
sys/dev/sdhci/fsl_sdhci.c
View File

@ -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);

4
sys/dev/sdhci/sdhci.c
View File

@ -1051,12 +1051,14 @@ sdhci_init_slot(device_t dev, struct sdhci_slot *slot, int num)
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, int which,
#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;

5
sys/dev/sdhci/sdhci.h
View File

@ -430,9 +430,4 @@ bool sdhci_generic_get_card_present(device_t brdev, struct sdhci_slot *slot);
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__ */

4
sys/dev/sdhci/sdhci_pci.c
View File

@ -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);