From 677676cd584033a47974c3634c6c9235e14db1a4 Mon Sep 17 00:00:00 2001 From: Jean Sacren Date: Sat, 1 Mar 2014 15:54:36 -0700 Subject: ieee802154: fix at86rf212_set_txpower() exit path The commit 9b2777d6089bc ("ieee802154: add TX power control to wpan_phy") introduced the new function at86rf212_set_txpower() with the questionable check of the return of __at86rf230_write() in the exit path: 1) Both at86rf212_set_txpower() and __at86rf230_write() have the same return type. 2) Whatever __at86rf230_write() returns becomes the return value of at86rf212_set_txpower(). Thus, fix the exit path by getting rid of that check entirely. Signed-off-by: Jean Sacren Cc: Phoebe Buckheister Signed-off-by: David S. Miller --- drivers/net/ieee802154/at86rf230.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c index dd9ef5e1c730..03e24c560b2e 100644 --- a/drivers/net/ieee802154/at86rf230.c +++ b/drivers/net/ieee802154/at86rf230.c @@ -786,7 +786,6 @@ static int at86rf212_set_txpower(struct ieee802154_dev *dev, int db) { struct at86rf230_local *lp = dev->priv; - int rc; /* typical maximum output is 5dBm with RG_PHY_TX_PWR 0x60, lower five * bits decrease power in 1dB steps. 0x60 represents extra PA gain of @@ -799,11 +798,7 @@ at86rf212_set_txpower(struct ieee802154_dev *dev, int db) db = -(db - 5); - rc = __at86rf230_write(lp, RG_PHY_TX_PWR, 0x60 | db); - if (rc) - return rc; - - return 0; + return __at86rf230_write(lp, RG_PHY_TX_PWR, 0x60 | db); } static int -- cgit v1.2.3-55-g7522