linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pawel Laszczak <pawell@cadence.com>
To: <balbi@kernel.org>, <gregkh@linuxfoundation.org>,
	<linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<rogerq@ti.com>, <peter.chen@nxp.com>
Cc: <dan.carpenter@oracle.com>, <heikki.krogerus@linux.intel.com>,
	<colin.king@canonical.com>, <jpawar@cadence.com>,
	<ben.dooks@codethink.co.uk>, <kurahul@cadence.com>,
	<sparmar@cadence.com>, Pawel Laszczak <pawell@cadence.com>
Subject: [PATCH v2 8/9] usb: cdns3: core: removed overwriting some error code
Date: Mon, 13 Jul 2020 12:05:53 +0200	[thread overview]
Message-ID: <20200713100554.28530-9-pawell@cadence.com> (raw)
In-Reply-To: <20200713100554.28530-1-pawell@cadence.com>

Some error code can be preserved, so we can remove overwriting
error code returned by some functions.

Signed-off-by: Pawel Laszczak <pawell@cadence.com>
Reviewed-by: Peter Chen <peter.chen@nxp.com>
---
 drivers/usb/cdns3/core.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index 8e3996f211a8..72885c5edb09 100644
--- a/drivers/usb/cdns3/core.c
+++ b/drivers/usb/cdns3/core.c
@@ -347,7 +347,6 @@ static int cdns3_role_set(struct usb_role_switch *sw, enum usb_role role)
 		case USB_ROLE_HOST:
 			break;
 		default:
-			ret = -EPERM;
 			goto pm_put;
 		}
 	}
@@ -358,17 +357,14 @@ static int cdns3_role_set(struct usb_role_switch *sw, enum usb_role role)
 		case USB_ROLE_DEVICE:
 			break;
 		default:
-			ret = -EPERM;
 			goto pm_put;
 		}
 	}
 
 	cdns3_role_stop(cdns);
 	ret = cdns3_role_start(cdns, role);
-	if (ret) {
+	if (ret)
 		dev_err(cdns->dev, "set role %d has failed\n", role);
-		ret = -EPERM;
-	}
 
 pm_put:
 	pm_runtime_put_sync(cdns->dev);
@@ -393,7 +389,7 @@ static int cdns3_probe(struct platform_device *pdev)
 	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
 	if (ret) {
 		dev_err(dev, "error setting dma mask: %d\n", ret);
-		return -ENODEV;
+		return ret;
 	}
 
 	cdns = devm_kzalloc(dev, sizeof(*cdns), GFP_KERNEL);
-- 
2.17.1


  parent reply	other threads:[~2020-07-13 10:07 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-13 10:05 [PATCH v2 0/9] usb: cdns3: Improvements for cdns3 DRD code Pawel Laszczak
2020-07-13 10:05 ` [PATCH v2 1/9] usb: cdns3: core: removed cdns3_get_current_role_driver function Pawel Laszczak
2020-07-13 10:05 ` [PATCH v2 2/9] usb: cdns3: drd: removed not needed variables initialization Pawel Laszczak
2020-07-22  0:34   ` Peter Chen
2020-07-13 10:05 ` [PATCH v2 3/9] usb: cnds3: drd: deleted != Pawel Laszczak
2020-07-22  0:34   ` Peter Chen
2020-07-13 10:05 ` [PATCH v2 4/9] usb: cdns3: drd: return IRQ_NONE explicitly Pawel Laszczak
2020-07-22  0:35   ` Peter Chen
2020-07-13 10:05 ` [PATCH v2 5/9] usb: cdns3: drd: changed return type from int to bool Pawel Laszczak
2020-07-22  0:35   ` Peter Chen
2020-07-13 10:05 ` [PATCH v2 6/9] usb: cdns3: Added CDNS3_ID_PERIPHERAL and CDNS3_ID_HOST Pawel Laszczak
2020-07-22  0:38   ` Peter Chen
2020-07-13 10:05 ` [PATCH v2 7/9] usb: cdns3: core: removed 'goto not_otg' Pawel Laszczak
2020-07-22  2:41   ` Peter Chen
2020-08-03  4:27     ` Pawel Laszczak
2020-07-13 10:05 ` Pawel Laszczak [this message]
2020-07-13 10:05 ` [PATCH v2 9/9] usb: cdns3: drd: simplify *switch_gadet and *switch_host Pawel Laszczak

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=20200713100554.28530-9-pawell@cadence.com \
    --to=pawell@cadence.com \
    --cc=balbi@kernel.org \
    --cc=ben.dooks@codethink.co.uk \
    --cc=colin.king@canonical.com \
    --cc=dan.carpenter@oracle.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=heikki.krogerus@linux.intel.com \
    --cc=jpawar@cadence.com \
    --cc=kurahul@cadence.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=peter.chen@nxp.com \
    --cc=rogerq@ti.com \
    --cc=sparmar@cadence.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;
as well as URLs for NNTP newsgroup(s).