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 7/9] usb: cdns3: core: removed 'goto not_otg'
Date: Mon, 13 Jul 2020 12:05:52 +0200 [thread overview]
Message-ID: <20200713100554.28530-8-pawell@cadence.com> (raw)
In-Reply-To: <20200713100554.28530-1-pawell@cadence.com>
Patch removes 'goto not_otg' instruction from
cdns3_hw_role_state_machine function.
Signed-off-by: Pawel Laszczak <pawell@cadence.com>
---
drivers/usb/cdns3/core.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index c498b585eb13..8e3996f211a8 100644
--- a/drivers/usb/cdns3/core.c
+++ b/drivers/usb/cdns3/core.c
@@ -191,11 +191,17 @@ static int cdns3_core_init_role(struct cdns3 *cdns)
*/
static enum usb_role cdns3_hw_role_state_machine(struct cdns3 *cdns)
{
- enum usb_role role;
+ enum usb_role role = USB_ROLE_NONE;
int id, vbus;
- if (cdns->dr_mode != USB_DR_MODE_OTG)
- goto not_otg;
+ if (cdns->dr_mode != USB_DR_MODE_OTG) {
+ if (cdns3_is_host(cdns))
+ role = USB_ROLE_HOST;
+ if (cdns3_is_device(cdns))
+ role = USB_ROLE_DEVICE;
+
+ return role;
+ }
id = cdns3_get_id(cdns);
vbus = cdns3_get_vbus(cdns);
@@ -232,14 +238,6 @@ static enum usb_role cdns3_hw_role_state_machine(struct cdns3 *cdns)
dev_dbg(cdns->dev, "role %d -> %d\n", cdns->role, role);
return role;
-
-not_otg:
- if (cdns3_is_host(cdns))
- role = USB_ROLE_HOST;
- if (cdns3_is_device(cdns))
- role = USB_ROLE_DEVICE;
-
- return role;
}
static int cdns3_idle_role_start(struct cdns3 *cdns)
--
2.17.1
next prev 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 ` Pawel Laszczak [this message]
2020-07-22 2:41 ` [PATCH v2 7/9] usb: cdns3: core: removed 'goto not_otg' Peter Chen
2020-08-03 4:27 ` Pawel Laszczak
2020-07-13 10:05 ` [PATCH v2 8/9] usb: cdns3: core: removed overwriting some error code Pawel Laszczak
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-8-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).