Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c033bed authored by Stanislav Yakovlev's avatar Stanislav Yakovlev Committed by John W. Linville
Browse files

net/wireless: ipw2x00: remove unreachable code 



Remove unnecessary if statements because libipw_set_geo always
returns success.  Also change function's return value from int
to void.

Signed-off-by: default avatarStanislav Yakovlev <stas.yakovlev@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b87e2c48

drivers/net/wireless/ipw2x00/ipw2100.c

+1 −4
Original line number Diff line number Diff line
@@ -1788,10 +1788,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred) 
	}



	/* Initialize the geo */

	if (libipw_set_geo(priv->ieee, &ipw_geos[0])) {

		printk(KERN_WARNING DRV_NAME "Could not set geo\n");

		return 0;

	}

	libipw_set_geo(priv->ieee, &ipw_geos[0]);

	priv->ieee->freq_band = LIBIPW_24GHZ_BAND;



	lock = LOCK_NONE;

drivers/net/wireless/ipw2x00/ipw2200.c

+1 −4
Original line number Diff line number Diff line
@@ -11322,10 +11322,7 @@ static int ipw_up(struct ipw_priv *priv) 
				    priv->eeprom[EEPROM_COUNTRY_CODE + 2]);

			j = 0;

		}

		if (libipw_set_geo(priv->ieee, &ipw_geos[j])) {

			IPW_WARNING("Could not set geography.");

			return 0;

		}

		libipw_set_geo(priv->ieee, &ipw_geos[j]);



		if (priv->status & STATUS_RF_KILL_SW) {

			IPW_WARNING("Radio disabled by module parameter.\n");

drivers/net/wireless/ipw2x00/libipw.h

+1 −1
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ extern void libipw_network_reset(struct libipw_network *network); 
/* libipw_geo.c */

extern const struct libipw_geo *libipw_get_geo(struct libipw_device

						     *ieee);

extern int libipw_set_geo(struct libipw_device *ieee,

extern void libipw_set_geo(struct libipw_device *ieee,

			     const struct libipw_geo *geo);



extern int libipw_is_valid_channel(struct libipw_device *ieee,

drivers/net/wireless/ipw2x00/libipw_geo.c

+1 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ u8 libipw_freq_to_channel(struct libipw_device * ieee, u32 freq) 
	return 0;

}



int libipw_set_geo(struct libipw_device *ieee,

void libipw_set_geo(struct libipw_device *ieee,

		      const struct libipw_geo *geo)

{

	memcpy(ieee->geo.name, geo->name, 3);
@@ -143,7 +143,6 @@ int libipw_set_geo(struct libipw_device *ieee, 
	       sizeof(struct libipw_channel));

	memcpy(ieee->geo.a, geo->a, ieee->geo.a_channels *

	       sizeof(struct libipw_channel));

	return 0;

}



const struct libipw_geo *libipw_get_geo(struct libipw_device *ieee)