Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 28 Jan 2019 00:58:01 +0000 (UTC)
From:      Andriy Voskoboinyk <avos@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r343507 - in stable: 11/sys/dev/iwn 12/sys/dev/iwn
Message-ID:  <201901280058.x0S0w1Sq075223@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: avos
Date: Mon Jan 28 00:58:01 2019
New Revision: 343507
URL: https://svnweb.freebsd.org/changeset/base/343507

Log:
  MFC r343235:
  iwn(4): drop return code from iwn_*attach functions (they cannot fail)
  
  While here, add missing trace 'end' marker in iwn5000_attach().

Modified:
  stable/12/sys/dev/iwn/if_iwn.c
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/dev/iwn/if_iwn.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/sys/dev/iwn/if_iwn.c
==============================================================================
--- stable/12/sys/dev/iwn/if_iwn.c	Mon Jan 28 00:51:26 2019	(r343506)
+++ stable/12/sys/dev/iwn/if_iwn.c	Mon Jan 28 00:58:01 2019	(r343507)
@@ -131,8 +131,8 @@ static const struct iwn_ident iwn_ident_table[] = {
 
 static int	iwn_probe(device_t);
 static int	iwn_attach(device_t);
-static int	iwn4965_attach(struct iwn_softc *, uint16_t);
-static int	iwn5000_attach(struct iwn_softc *, uint16_t);
+static void	iwn4965_attach(struct iwn_softc *, uint16_t);
+static void	iwn5000_attach(struct iwn_softc *, uint16_t);
 static int	iwn_config_specific(struct iwn_softc *, uint16_t);
 static void	iwn_radiotap_attach(struct iwn_softc *);
 static void	iwn_sysctlattach(struct iwn_softc *);
@@ -489,14 +489,9 @@ iwn_attach(device_t dev)
 	 * Let's set those up first.
 	 */
 	if (sc->hw_type == IWN_HW_REV_TYPE_4965)
-		error = iwn4965_attach(sc, pci_get_device(dev));
+		iwn4965_attach(sc, pci_get_device(dev));
 	else
-		error = iwn5000_attach(sc, pci_get_device(dev));
-	if (error != 0) {
-		device_printf(dev, "could not attach device, error %d\n",
-		    error);
-		goto fail;
-	}
+		iwn5000_attach(sc, pci_get_device(dev));
 
 	/*
 	 * Next, let's setup the various parameters of each NIC.
@@ -1218,12 +1213,13 @@ iwn_config_specific(struct iwn_softc *sc, uint16_t pid
 	return 0;
 }
 
-static int
+static void
 iwn4965_attach(struct iwn_softc *sc, uint16_t pid)
 {
 	struct iwn_ops *ops = &sc->ops;
 
 	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s begin\n", __func__);
+
 	ops->load_firmware = iwn4965_load_firmware;
 	ops->read_eeprom = iwn4965_read_eeprom;
 	ops->post_alive = iwn4965_post_alive;
@@ -1258,11 +1254,9 @@ iwn4965_attach(struct iwn_softc *sc, uint16_t pid)
 	sc->sc_flags |= IWN_FLAG_BTCOEX;
 
 	DPRINTF(sc, IWN_DEBUG_TRACE, "%s: end\n",__func__);
-
-	return 0;
 }
 
-static int
+static void
 iwn5000_attach(struct iwn_softc *sc, uint16_t pid)
 {
 	struct iwn_ops *ops = &sc->ops;
@@ -1297,7 +1291,7 @@ iwn5000_attach(struct iwn_softc *sc, uint16_t pid)
 	sc->reset_noise_gain = IWN5000_PHY_CALIB_RESET_NOISE_GAIN;
 	sc->noise_gain = IWN5000_PHY_CALIB_NOISE_GAIN;
 
-	return 0;
+	DPRINTF(sc, IWN_DEBUG_TRACE, "%s: end\n",__func__);
 }
 
 /*

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