diff options
| author | ian <ian@FreeBSD.org> | 2017-03-01 21:18:42 +0000 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2017-05-08 16:09:31 -0500 |
| commit | f17cfedfbe1fe06286fe2552c46197223ac54a6f (patch) | |
| tree | 586f1c54ac1176d8b3367d6d0b5a3ec14df9c4e5 | |
| parent | 6919eb638da319b02852bbed4b1c4858425ef401 (diff) | |
| download | FreeBSD-src-f17cfedfbe1fe06286fe2552c46197223ac54a6f.zip FreeBSD-src-f17cfedfbe1fe06286fe2552c46197223ac54a6f.tar.gz | |
MFC r314064, r314060:
Fix typos in bootverbose printfs... display the write-protect pin info,
not the card-detect pin info.
Remove a variable that has been unused since r311735 (it should have been
removed as part of those changes).
(cherry picked from commit 2d33dfd7e9d89d3a151a14912c61ec597c229c88)
| -rw-r--r-- | sys/arm/ti/ti_sdhci.c | 1 | ||||
| -rw-r--r-- | sys/dev/sdhci/sdhci_fdt_gpio.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sys/arm/ti/ti_sdhci.c b/sys/arm/ti/ti_sdhci.c index 379edc7..16fa956 100644 --- a/sys/arm/ti/ti_sdhci.c +++ b/sys/arm/ti/ti_sdhci.c @@ -71,7 +71,6 @@ struct ti_sdhci_softc { uint32_t mmchs_reg_off; uint32_t sdhci_reg_off; uint32_t baseclk_hz; - uint32_t wp_gpio_pin; uint32_t cmd_and_mode; uint32_t sdhci_clkdiv; boolean_t disable_highspeed; diff --git a/sys/dev/sdhci/sdhci_fdt_gpio.c b/sys/dev/sdhci/sdhci_fdt_gpio.c index 9935f17..77bc745 100644 --- a/sys/dev/sdhci/sdhci_fdt_gpio.c +++ b/sys/dev/sdhci/sdhci_fdt_gpio.c @@ -188,7 +188,7 @@ wp_setup(struct sdhci_fdt_gpio *gpio, phandle_t node) if (bootverbose) device_printf(dev, "Write protect switch on %s pin %u\n", - device_get_nameunit(gpio->cd_pin->dev), gpio->cd_pin->pin); + device_get_nameunit(gpio->wp_pin->dev), gpio->wp_pin->pin); } struct sdhci_fdt_gpio * |
