Skip to content

Commit

Permalink
mfd: wm8400-core: Delete wm8400_reg_read()
Browse files Browse the repository at this point in the history
There was a static checker warning in wm8400_reg_read() because we were
returning u16 and that can't hold the negative error codes.  The
function isn't used, so let's just delete it.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
  • Loading branch information
Dan Carpenter authored and Lee Jones committed May 9, 2016
1 parent f83c218 commit 0e10d54
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 22 deletions.
21 changes: 0 additions & 21 deletions drivers/mfd/wm8400-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,6 @@ static bool wm8400_volatile(struct device *dev, unsigned int reg)
}
}

/**
* wm8400_reg_read - Single register read
*
* @wm8400: Pointer to wm8400 control structure
* @reg: Register to read
*
* @return Read value
*/
u16 wm8400_reg_read(struct wm8400 *wm8400, u8 reg)
{
unsigned int val;
int ret;

ret = regmap_read(wm8400->regmap, reg, &val);
if (ret < 0)
return ret;

return val;
}
EXPORT_SYMBOL_GPL(wm8400_reg_read);

int wm8400_block_read(struct wm8400 *wm8400, u8 reg, int count, u16 *data)
{
return regmap_bulk_read(wm8400->regmap, reg, data, count);
Expand Down
1 change: 0 additions & 1 deletion include/linux/mfd/wm8400-private.h
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,6 @@ struct wm8400 {
#define WM8400_LINE_CMP_VTHD_SHIFT 0 /* LINE_CMP_VTHD - [3:0] */
#define WM8400_LINE_CMP_VTHD_WIDTH 4 /* LINE_CMP_VTHD - [3:0] */

u16 wm8400_reg_read(struct wm8400 *wm8400, u8 reg);
int wm8400_block_read(struct wm8400 *wm8400, u8 reg, int count, u16 *data);

static inline int wm8400_set_bits(struct wm8400 *wm8400, u8 reg,
Expand Down

0 comments on commit 0e10d54

Please sign in to comment.