From e16f7c59de11dc6f2436cfcae13f35f8d0fe6fbc Mon Sep 17 00:00:00 2001 From: Teemu Paasikivi Date: Thu, 18 Feb 2010 13:25:56 +0200 Subject: [PATCH] --- yaml --- r: 184475 b: refs/heads/master c: 9b28072220d56fda3249cb7e4e164038b456414d h: refs/heads/master i: 184473: fdffbfa36ac9be2a8deb18060f74b376397586de 184471: fa6ebd12ee3b5f1628d1530204108f17df1b9488 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/wl1271_io.c | 10 ++++++++++ trunk/drivers/net/wireless/wl12xx/wl1271_io.h | 2 ++ trunk/drivers/net/wireless/wl12xx/wl1271_main.c | 4 ++-- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 09967ef98492..9fa42e7c6fa9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b048c52d7283ebf07c826a45c631a6ba225c057 +refs/heads/master: 9b28072220d56fda3249cb7e4e164038b456414d diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_io.c b/trunk/drivers/net/wireless/wl12xx/wl1271_io.c index 00f98bdc48f7..5cd94d5666c2 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_io.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1271_io.c @@ -115,6 +115,16 @@ int wl1271_set_partition(struct wl1271 *wl, return 0; } +void wl1271_io_reset(struct wl1271 *wl) +{ + wl1271_spi_reset(wl); +} + +void wl1271_io_init(struct wl1271 *wl) +{ + wl1271_spi_init(wl); +} + void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf, size_t len, bool fixed) { diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_io.h b/trunk/drivers/net/wireless/wl12xx/wl1271_io.h index 859d571dc413..fa9a0b35788f 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_io.h +++ b/trunk/drivers/net/wireless/wl12xx/wl1271_io.h @@ -27,6 +27,8 @@ struct wl1271; +void wl1271_io_reset(struct wl1271 *wl); +void wl1271_io_init(struct wl1271 *wl); /* Raw target IO, address is not translated */ void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf, diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c index 46968958aeff..66fb9a0a8efa 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c @@ -648,8 +648,8 @@ static int wl1271_chip_wakeup(struct wl1271 *wl) msleep(WL1271_PRE_POWER_ON_SLEEP); wl1271_power_on(wl); msleep(WL1271_POWER_ON_SLEEP); - wl1271_spi_reset(wl); - wl1271_spi_init(wl); + wl1271_io_reset(wl); + wl1271_io_init(wl); /* We don't need a real memory partition here, because we only want * to use the registers at this point. */