mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Javier Martinez Canillas <javier@osg.samsung.com>
To: linux-kernel@vger.kernel.org
Cc: Javier Martinez Canillas <javier@osg.samsung.com>,
	Lee Jones <lee.jones@linaro.org>,
	Samuel Ortiz <sameo@linux.intel.com>
Subject: [PATCH 5/8] mfd: rtsx: Simplify function return logic
Date: Tue, 29 Sep 2015 13:26:05 +0200	[thread overview]
Message-ID: <1443525968-30899-6-git-send-email-javier@osg.samsung.com> (raw)
In-Reply-To: <1443525968-30899-1-git-send-email-javier@osg.samsung.com>

The invoked functions already return zero on success or a negative
errno code so there is no need to open code the logic in the caller.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 drivers/mfd/rts5209.c  | 6 +-----
 drivers/mfd/rts5227.c  | 6 +-----
 drivers/mfd/rts5229.c  | 6 +-----
 drivers/mfd/rts5249.c  | 6 +-----
 drivers/mfd/rtsx_pcr.c | 6 +-----
 5 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/drivers/mfd/rts5209.c b/drivers/mfd/rts5209.c
index 373e253c33df..b95beecf767f 100644
--- a/drivers/mfd/rts5209.c
+++ b/drivers/mfd/rts5209.c
@@ -138,11 +138,7 @@ static int rts5209_card_power_on(struct rtsx_pcr *pcr, int card)
 	rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, CARD_PWR_CTL, pwr_mask, pwr_on);
 	rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PWR_GATE_CTRL,
 			LDO3318_PWR_MASK, 0x00);
-	err = rtsx_pci_send_cmd(pcr, 100);
-	if (err < 0)
-		return err;
-
-	return 0;
+	return rtsx_pci_send_cmd(pcr, 100);
 }
 
 static int rts5209_card_power_off(struct rtsx_pcr *pcr, int card)
diff --git a/drivers/mfd/rts5227.c b/drivers/mfd/rts5227.c
index ce012d78ce2a..c5a65298c781 100644
--- a/drivers/mfd/rts5227.c
+++ b/drivers/mfd/rts5227.c
@@ -179,11 +179,7 @@ static int rts5227_card_power_on(struct rtsx_pcr *pcr, int card)
 			SD_POWER_MASK, SD_POWER_ON);
 	rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PWR_GATE_CTRL,
 			LDO3318_PWR_MASK, 0x06);
-	err = rtsx_pci_send_cmd(pcr, 100);
-	if (err < 0)
-		return err;
-
-	return 0;
+	return rtsx_pci_send_cmd(pcr, 100);
 }
 
 static int rts5227_card_power_off(struct rtsx_pcr *pcr, int card)
diff --git a/drivers/mfd/rts5229.c b/drivers/mfd/rts5229.c
index ace45384ec8b..9ed9dc84eac8 100644
--- a/drivers/mfd/rts5229.c
+++ b/drivers/mfd/rts5229.c
@@ -129,11 +129,7 @@ static int rts5229_card_power_on(struct rtsx_pcr *pcr, int card)
 			SD_POWER_MASK, SD_POWER_ON);
 	rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PWR_GATE_CTRL,
 			LDO3318_PWR_MASK, 0x06);
-	err = rtsx_pci_send_cmd(pcr, 100);
-	if (err < 0)
-		return err;
-
-	return 0;
+	return rtsx_pci_send_cmd(pcr, 100);
 }
 
 static int rts5229_card_power_off(struct rtsx_pcr *pcr, int card)
diff --git a/drivers/mfd/rts5249.c b/drivers/mfd/rts5249.c
index eb2d5866f719..40f8bb14fc59 100644
--- a/drivers/mfd/rts5249.c
+++ b/drivers/mfd/rts5249.c
@@ -234,11 +234,7 @@ static int rtsx_base_card_power_on(struct rtsx_pcr *pcr, int card)
 			SD_POWER_MASK, SD_VCC_POWER_ON);
 	rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PWR_GATE_CTRL,
 			LDO3318_PWR_MASK, 0x06);
-	err = rtsx_pci_send_cmd(pcr, 100);
-	if (err < 0)
-		return err;
-
-	return 0;
+	return rtsx_pci_send_cmd(pcr, 100);
 }
 
 static int rtsx_base_card_power_off(struct rtsx_pcr *pcr, int card)
diff --git a/drivers/mfd/rtsx_pcr.c b/drivers/mfd/rtsx_pcr.c
index a66540a49079..b98cf1de0a55 100644
--- a/drivers/mfd/rtsx_pcr.c
+++ b/drivers/mfd/rtsx_pcr.c
@@ -571,11 +571,7 @@ static int rtsx_pci_set_pull_ctl(struct rtsx_pcr *pcr, const u32 *tbl)
 		tbl++;
 	}
 
-	err = rtsx_pci_send_cmd(pcr, 100);
-	if (err < 0)
-		return err;
-
-	return 0;
+	return rtsx_pci_send_cmd(pcr, 100);
 }
 
 int rtsx_pci_card_pull_ctl_enable(struct rtsx_pcr *pcr, int card)
-- 
2.4.3


  parent reply	other threads:[~2015-09-29 11:27 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-29 11:26 [PATCH 0/8] mfd: Simplify " Javier Martinez Canillas
2015-09-29 11:26 ` [PATCH 1/8] mfd: htc-i2cpld: Remove unneded ret variable Javier Martinez Canillas
2015-10-01  7:17   ` Lee Jones
2015-09-29 11:26 ` [PATCH 2/8] mfd: arizona: " Javier Martinez Canillas
2015-09-29 11:24   ` Charles Keepax
2015-10-01  7:18   ` Lee Jones
2015-09-29 11:26 ` [PATCH 3/8] mfd: pcf50633: " Javier Martinez Canillas
2015-10-01  7:18   ` Lee Jones
2015-09-29 11:26 ` [PATCH 4/8] mfd: kempld-core: Simplify function return logic Javier Martinez Canillas
2015-10-01  7:19   ` Lee Jones
2015-09-29 11:26 ` Javier Martinez Canillas [this message]
2015-10-01  7:19   ` [PATCH 5/8] mfd: rtsx: " Lee Jones
2015-09-29 11:26 ` [PATCH 6/8] mfd: da903x: " Javier Martinez Canillas
2015-09-29 12:24   ` Opensource [Adam Thomson]
2015-10-01  7:20   ` Lee Jones
2015-09-29 11:26 ` [PATCH 7/8] mfd: da9052: " Javier Martinez Canillas
2015-09-29 12:24   ` Opensource [Adam Thomson]
2015-10-01  7:20   ` Lee Jones
2015-09-29 11:26 ` [PATCH 8/8] mfd: lm3533: " Javier Martinez Canillas
2015-09-30 21:04   ` Johan Hovold
2015-09-30 21:41     ` Javier Martinez Canillas
2015-09-30 21:55       ` Johan Hovold
2015-10-01  7:17     ` Lee Jones
2015-10-01 17:59       ` Johan Hovold
2015-10-01  7:21   ` Lee Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1443525968-30899-6-git-send-email-javier@osg.samsung.com \
    --to=javier@osg.samsung.com \
    --cc=lee.jones@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sameo@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®