Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 15 Mar 2015 20:43:59 +0000 (UTC)
From:      Adrian Chadd <adrian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r280076 - head/sys/dev/wpi
Message-ID:  <201503152043.t2FKhxfc069070@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: adrian
Date: Sun Mar 15 20:43:58 2015
New Revision: 280076
URL: https://svnweb.freebsd.org/changeset/base/280076

Log:
  Optimise sc->rev processing.
  
  PR:		kern/197143
  Submitted by:	Andriy Voskoboinyk <s3erios@gmail.com>

Modified:
  head/sys/dev/wpi/if_wpi.c

Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c	Sun Mar 15 20:43:22 2015	(r280075)
+++ head/sys/dev/wpi/if_wpi.c	Sun Mar 15 20:43:58 2015	(r280076)
@@ -469,7 +469,7 @@ wpi_attach(device_t dev)
 		device_printf(sc->sc_dev, "Hardware Type: %c\n",
 		    sc->type > 1 ? 'B': '?');
 		device_printf(sc->sc_dev, "Hardware Revision: %c\n",
-		    ((le16toh(sc->rev) & 0xf0) == 0xd0) ? 'D': '?');
+		    ((sc->rev & 0xf0) == 0xd0) ? 'D': '?');
 		device_printf(sc->sc_dev, "SKU %s support 802.11a\n",
 		    supportsa ? "does" : "does not");
 
@@ -1299,8 +1299,9 @@ wpi_read_eeprom(struct wpi_softc *sc, ui
 	WPI_CHK(wpi_read_prom_data(sc, WPI_EEPROM_TYPE, &sc->type,
 	    sizeof(sc->type)));
 
+	sc->rev = le16toh(sc->rev);
 	DPRINTF(sc, WPI_DEBUG_EEPROM, "cap=%x rev=%x type=%x\n", sc->cap,
-	    le16toh(sc->rev), sc->type);
+	    sc->rev, sc->type);
 
 	/* Read the regulatory domain (4 ASCII characters.) */
 	WPI_CHK(wpi_read_prom_data(sc, WPI_EEPROM_DOMAIN, sc->domain,
@@ -4589,7 +4590,7 @@ wpi_nic_config(struct wpi_softc *sc)
 	if (sc->cap == 0x80)
 		WPI_SETBITS(sc, WPI_HW_IF_CONFIG, WPI_HW_IF_CONFIG_SKU_MRC);
 
-	if ((le16toh(sc->rev) & 0xf0) == 0xd0)
+	if ((sc->rev & 0xf0) == 0xd0)
 		WPI_SETBITS(sc, WPI_HW_IF_CONFIG, WPI_HW_IF_CONFIG_REV_D);
 	else
 		WPI_CLRBITS(sc, WPI_HW_IF_CONFIG, WPI_HW_IF_CONFIG_REV_D);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503152043.t2FKhxfc069070>