Andrey Borzenkov wrote: > Currently part of support for FW caching is unconditionally compiled > in even if it is never used. Consistently remove caching support if > not requested by user. > > Signed-off-by: Andrey Borzenkov <arvidjaar@xxxxxxx> > --- a/drivers/net/wireless/orinoco/fw.h > +++ b/drivers/net/wireless/orinoco/fw.h > @@ -10,7 +10,12 @@ struct orinoco_private; > > -void orinoco_cache_fw(struct orinoco_private *priv, int ap); > -void orinoco_uncache_fw(struct orinoco_private *priv); > +#if defined(CONFIG_HERMES_CACHE_FW_ON_INIT) || defined(CONFIG_PM_SLEEP) > +extern void orinoco_cache_fw(struct orinoco_private *priv, int ap); > +extern void orinoco_uncache_fw(struct orinoco_private *priv); Please remove the explicit externs. > --- a/drivers/net/wireless/orinoco/main.c > +++ b/drivers/net/wireless/orinoco/main.c > @@ -2580,8 +2580,10 @@ struct net_device > > - priv->cached_pri_fw = NULL; > +#if defined(CONFIG_HERMES_CACHE_FW_ON_INIT) || defined(CONFIG_PM_SLEEP) > priv->cached_fw = NULL; > + priv->cached_pri_fw = NULL; > +#endif Please leave the orderring alone. These just minimize the changes and reduce potential for conflicts during rebases/merges. Acked-by: David Kilroy <kilroyd@xxxxxxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
