svn commit: r314514 - in stable/11/sys: arm/ti dev/sdhci

[Ian Lepore]

Author: ian
Date: Wed Mar  1 21:18:42 2017
New Revision: 314514
URL: https://svnweb.freebsd.org/changeset/base/314514

Log:
  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).

Modified:
  stable/11/sys/arm/ti/ti_sdhci.c
  stable/11/sys/dev/sdhci/sdhci_fdt_gpio.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm/ti/ti_sdhci.c
==============================================================================
--- stable/11/sys/arm/ti/ti_sdhci.c	Wed Mar  1 21:12:50 2017	(r314513)
+++ stable/11/sys/arm/ti/ti_sdhci.c	Wed Mar  1 21:18:42 2017	(r314514)
@@ -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;

Modified: stable/11/sys/dev/sdhci/sdhci_fdt_gpio.c
==============================================================================
--- stable/11/sys/dev/sdhci/sdhci_fdt_gpio.c	Wed Mar  1 21:12:50 2017	(r314513)
+++ stable/11/sys/dev/sdhci/sdhci_fdt_gpio.c	Wed Mar  1 21:18:42 2017	(r314514)
@@ -188,7 +188,7 @@ wp_setup(struct sdhci_fdt_gpio *gpio, ph
 
 	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 *