Skip to content

Commit

Permalink
wlcore: Change raw io functions to return errors
Browse files Browse the repository at this point in the history 
Make wl1271_raw_write and wl1271_raw_read return errors so the driver
could handle these appropriately.
Since the prototype has changed, also rename the prefix of these
functions to wlcore.

Signed-off-by: Ido Yariv <ido@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
  • Loading branch information
Ido Yariv authored and Luciano Coelho committed Jun 22, 2012
1 parent 02eb1d9 commit 0c2a6ce
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions drivers/net/wireless/ti/wlcore/io.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,33 +53,33 @@ void wl1271_io_init(struct wl1271 *wl);
int wlcore_translate_addr(struct wl1271 *wl, int addr);

/* Raw target IO, address is not translated */
static inline void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf,
size_t len, bool fixed)
static inline int wlcore_raw_write(struct wl1271 *wl, int addr, void *buf,
size_t len, bool fixed)
{
wl->if_ops->write(wl->dev, addr, buf, len, fixed);
return wl->if_ops->write(wl->dev, addr, buf, len, fixed);
}

static inline void wl1271_raw_read(struct wl1271 *wl, int addr, void *buf,
size_t len, bool fixed)
static inline int wlcore_raw_read(struct wl1271 *wl, int addr, void *buf,
size_t len, bool fixed)
{
wl->if_ops->read(wl->dev, addr, buf, len, fixed);
return wl->if_ops->read(wl->dev, addr, buf, len, fixed);
}

static inline void wlcore_raw_read_data(struct wl1271 *wl, int reg, void *buf,
size_t len, bool fixed)
{
wl1271_raw_read(wl, wl->rtable[reg], buf, len, fixed);
wlcore_raw_read(wl, wl->rtable[reg], buf, len, fixed);
}

static inline void wlcore_raw_write_data(struct wl1271 *wl, int reg, void *buf,
size_t len, bool fixed)
{
wl1271_raw_write(wl, wl->rtable[reg], buf, len, fixed);
wlcore_raw_write(wl, wl->rtable[reg], buf, len, fixed);
}

static inline u32 wl1271_raw_read32(struct wl1271 *wl, int addr)
{
wl1271_raw_read(wl, addr, &wl->buffer_32,
wlcore_raw_read(wl, addr, &wl->buffer_32,
sizeof(wl->buffer_32), false);

return le32_to_cpu(wl->buffer_32);
Expand All @@ -88,7 +88,7 @@ static inline u32 wl1271_raw_read32(struct wl1271 *wl, int addr)
static inline void wl1271_raw_write32(struct wl1271 *wl, int addr, u32 val)
{
wl->buffer_32 = cpu_to_le32(val);
wl1271_raw_write(wl, addr, &wl->buffer_32,
wlcore_raw_write(wl, addr, &wl->buffer_32,
sizeof(wl->buffer_32), false);
}

Expand All @@ -99,7 +99,7 @@ static inline void wl1271_read(struct wl1271 *wl, int addr, void *buf,

physical = wlcore_translate_addr(wl, addr);

wl1271_raw_read(wl, physical, buf, len, fixed);
wlcore_raw_read(wl, physical, buf, len, fixed);
}

static inline void wl1271_write(struct wl1271 *wl, int addr, void *buf,
Expand All @@ -109,7 +109,7 @@ static inline void wl1271_write(struct wl1271 *wl, int addr, void *buf,

physical = wlcore_translate_addr(wl, addr);

wl1271_raw_write(wl, physical, buf, len, fixed);
wlcore_raw_write(wl, physical, buf, len, fixed);
}

static inline void wlcore_write_data(struct wl1271 *wl, int reg, void *buf,
Expand All @@ -135,7 +135,7 @@ static inline void wl1271_read_hwaddr(struct wl1271 *wl, int hwaddr,

physical = wlcore_translate_addr(wl, addr);

wl1271_raw_read(wl, physical, buf, len, fixed);
wlcore_raw_read(wl, physical, buf, len, fixed);
}

static inline u32 wl1271_read32(struct wl1271 *wl, int addr)
Expand Down

0 comments on commit 0c2a6ce

Please sign in to comment.