Ohad, > -----Original Message----- > From: linux-omap-owner@xxxxxxxxxxxxxxx [mailto:linux-omap- > owner@xxxxxxxxxxxxxxx] On Behalf Of Ohad Ben-Cohen > Sent: Wednesday, August 11, 2010 11:52 PM > To: linux-wireless@xxxxxxxxxxxxxxx; linux-mmc@xxxxxxxxxxxxxxx; linux- > omap@xxxxxxxxxxxxxxx > Cc: Ido Yariv; Mark Brown; linux-arm-kernel@xxxxxxxxxxxxxxxxxxx; > Chikkature Rajashekar, Madhusudhan; Luciano Coelho; akpm@linux- > foundation.org; San Mehat; Roger Quadros; Tony Lindgren; Nicolas Pitre; > Pandita, Vikram; Kalle Valo; Ohad Ben-Cohen > Subject: [PATCH v4 2/8] wireless: wl1271: support return value for the set > power func > > Make it possible for the set power method to indicate a > success/failure return value. This is needed to support > more complex power on/off operations such as bringing up > (and down) sdio functions. > > Signed-off-by: Ohad Ben-Cohen <ohad@xxxxxxxxxx> > --- > drivers/net/wireless/wl12xx/wl1271.h | 2 +- > drivers/net/wireless/wl12xx/wl1271_io.h | 8 +++++--- > drivers/net/wireless/wl12xx/wl1271_main.c | 4 +++- > drivers/net/wireless/wl12xx/wl1271_sdio.c | 4 +++- > drivers/net/wireless/wl12xx/wl1271_spi.c | 4 +++- > 5 files changed, 15 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/wireless/wl12xx/wl1271.h > b/drivers/net/wireless/wl12xx/wl1271.h > index dd3cee6..faa5925 100644 > --- a/drivers/net/wireless/wl12xx/wl1271.h > +++ b/drivers/net/wireless/wl12xx/wl1271.h > @@ -313,7 +313,7 @@ struct wl1271_if_operations { > bool fixed); > void (*reset)(struct wl1271 *wl); > void (*init)(struct wl1271 *wl); > - void (*power)(struct wl1271 *wl, bool enable); > + int (*power)(struct wl1271 *wl, bool enable); > struct device* (*dev)(struct wl1271 *wl); > void (*enable_irq)(struct wl1271 *wl); > void (*disable_irq)(struct wl1271 *wl); > diff --git a/drivers/net/wireless/wl12xx/wl1271_io.h > b/drivers/net/wireless/wl12xx/wl1271_io.h > index bc806c7..4a5b92c 100644 > --- a/drivers/net/wireless/wl12xx/wl1271_io.h > +++ b/drivers/net/wireless/wl12xx/wl1271_io.h > @@ -144,10 +144,12 @@ static inline void wl1271_power_off(struct wl1271 > *wl) > clear_bit(WL1271_FLAG_GPIO_POWER, &wl->flags); > } > > -static inline void wl1271_power_on(struct wl1271 *wl) > +static inline int wl1271_power_on(struct wl1271 *wl) > { > - wl->if_ops->power(wl, true); > - set_bit(WL1271_FLAG_GPIO_POWER, &wl->flags); > + int ret = wl->if_ops->power(wl, true); Just a minor comment, need a blank line here? > + if (ret == 0) > + set_bit(WL1271_FLAG_GPIO_POWER, &wl->flags); > + return ret; > } > > > diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c > b/drivers/net/wireless/wl12xx/wl1271_main.c > index 9d68f00..e6e0852 100644 > --- a/drivers/net/wireless/wl12xx/wl1271_main.c > +++ b/drivers/net/wireless/wl12xx/wl1271_main.c > @@ -621,7 +621,9 @@ static int wl1271_chip_wakeup(struct wl1271 *wl) > int ret = 0; > > msleep(WL1271_PRE_POWER_ON_SLEEP); > - wl1271_power_on(wl); > + ret = wl1271_power_on(wl); > + if (ret < 0) > + goto out; > msleep(WL1271_POWER_ON_SLEEP); > wl1271_io_reset(wl); > wl1271_io_init(wl); > diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c > b/drivers/net/wireless/wl12xx/wl1271_sdio.c > index 7059b5c..c41293a 100644 > --- a/drivers/net/wireless/wl12xx/wl1271_sdio.c > +++ b/drivers/net/wireless/wl12xx/wl1271_sdio.c > @@ -152,7 +152,7 @@ static void wl1271_sdio_raw_write(struct wl1271 *wl, > int addr, void *buf, > > } > > -static void wl1271_sdio_set_power(struct wl1271 *wl, bool enable) > +static int wl1271_sdio_set_power(struct wl1271 *wl, bool enable) > { > struct sdio_func *func = wl_to_func(wl); > > @@ -167,6 +167,8 @@ static void wl1271_sdio_set_power(struct wl1271 *wl, > bool enable) > sdio_disable_func(func); > sdio_release_host(func); > } > + > + return 0; > } > > static struct wl1271_if_operations sdio_ops = { > diff --git a/drivers/net/wireless/wl12xx/wl1271_spi.c > b/drivers/net/wireless/wl12xx/wl1271_spi.c > index c3fdab7..de56d8d 100644 > --- a/drivers/net/wireless/wl12xx/wl1271_spi.c > +++ b/drivers/net/wireless/wl12xx/wl1271_spi.c > @@ -312,10 +312,12 @@ static irqreturn_t wl1271_irq(int irq, void *cookie) > return IRQ_HANDLED; > } > > -static void wl1271_spi_set_power(struct wl1271 *wl, bool enable) > +static int wl1271_spi_set_power(struct wl1271 *wl, bool enable) > { > if (wl->set_power) > wl->set_power(enable); > + > + return 0; > } > > static struct wl1271_if_operations spi_ops = { > -- > 1.7.0.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
