AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-27 13:35:09 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

usb: cdns3: drd: removed not needed variables initialization

Browse Source 
Patch remove some variables initialization from core.c and drd.c
file.

Reviewed-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Pawel Laszczak <pawell@cadence.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
This commit is contained in:
Pawel Laszczak 2020-07-13 12:05:47 +02:00 committed by Felipe Balbi
parent b20aecff99
commit 27afe16612
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/cdns3/core.c
View File

@ -86,7 +86,7 @@ static int cdns3_core_init_role(struct cdns3 *cdns)
struct device *dev = cdns->dev; struct device *dev = cdns->dev;
enum usb_dr_mode best_dr_mode; enum usb_dr_mode best_dr_mode;
enum usb_dr_mode dr_mode; enum usb_dr_mode dr_mode;
int ret = 0; int ret;
dr_mode = usb_get_dr_mode(dev); dr_mode = usb_get_dr_mode(dev);
cdns->role = USB_ROLE_NONE; cdns->role = USB_ROLE_NONE;
@ -177,7 +177,7 @@ static int cdns3_core_init_role(struct cdns3 *cdns)
goto err; goto err;
} }
return ret; return 0;
err: err:
cdns3_exit_roles(cdns); cdns3_exit_roles(cdns);
return ret; return ret;

19
drivers/usb/cdns3/drd.c
View File

@ -29,7 +29,6 @@
*/ */
int cdns3_set_mode(struct cdns3 *cdns, enum usb_dr_mode mode) int cdns3_set_mode(struct cdns3 *cdns, enum usb_dr_mode mode)
{ {
int ret = 0;
u32 reg; u32 reg;
switch (mode) { switch (mode) {
@ -61,7 +60,7 @@ int cdns3_set_mode(struct cdns3 *cdns, enum usb_dr_mode mode)
return -EINVAL; return -EINVAL;
} }
return ret; return 0;
} }
int cdns3_get_id(struct cdns3 *cdns) int cdns3_get_id(struct cdns3 *cdns)
@ -134,11 +133,11 @@ static void cdns3_otg_enable_irq(struct cdns3 *cdns)
int cdns3_drd_switch_host(struct cdns3 *cdns, int on) int cdns3_drd_switch_host(struct cdns3 *cdns, int on)
{ {
int ret, val; int ret, val;
u32 reg = OTGCMD_OTG_DIS;
/* switch OTG core */ /* switch OTG core */
if (on) { if (on) {
writel(OTGCMD_HOST_BUS_REQ | reg, &cdns->otg_regs->cmd); writel(OTGCMD_HOST_BUS_REQ | OTGCMD_OTG_DIS,
&cdns->otg_regs->cmd);
dev_dbg(cdns->dev, "Waiting till Host mode is turned on\n"); dev_dbg(cdns->dev, "Waiting till Host mode is turned on\n");
ret = readl_poll_timeout_atomic(&cdns->otg_regs->sts, val, ret = readl_poll_timeout_atomic(&cdns->otg_regs->sts, val,
@ -212,7 +211,7 @@ int cdns3_drd_switch_gadget(struct cdns3 *cdns, int on)
*/ */
static int cdns3_init_otg_mode(struct cdns3 *cdns) static int cdns3_init_otg_mode(struct cdns3 *cdns)
{ {
int ret = 0; int ret;
cdns3_otg_disable_irq(cdns); cdns3_otg_disable_irq(cdns);
/* clear all interrupts */ /* clear all interrupts */
@ -223,7 +222,8 @@ static int cdns3_init_otg_mode(struct cdns3 *cdns)
return ret; return ret;
cdns3_otg_enable_irq(cdns); cdns3_otg_enable_irq(cdns);
return ret;
return 0;
} }
/** /**
@ -234,7 +234,7 @@ static int cdns3_init_otg_mode(struct cdns3 *cdns)
*/ */
int cdns3_drd_update_mode(struct cdns3 *cdns) int cdns3_drd_update_mode(struct cdns3 *cdns)
{ {
int ret = 0; int ret;
switch (cdns->dr_mode) { switch (cdns->dr_mode) {
case USB_DR_MODE_PERIPHERAL: case USB_DR_MODE_PERIPHERAL:
@ -307,8 +307,8 @@ static irqreturn_t cdns3_drd_irq(int irq, void *data)
int cdns3_drd_init(struct cdns3 *cdns) int cdns3_drd_init(struct cdns3 *cdns)
{ {
void __iomem *regs; void __iomem *regs;
int ret = 0;
u32 state; u32 state;
int ret;
regs = devm_ioremap_resource(cdns->dev, &cdns->otg_res); regs = devm_ioremap_resource(cdns->dev, &cdns->otg_res);
if (IS_ERR(regs)) if (IS_ERR(regs))
@ -359,7 +359,6 @@ int cdns3_drd_init(struct cdns3 *cdns)
cdns3_drd_thread_irq, cdns3_drd_thread_irq,
IRQF_SHARED, IRQF_SHARED,
dev_name(cdns->dev), cdns); dev_name(cdns->dev), cdns);
if (ret) { if (ret) {
dev_err(cdns->dev, "couldn't get otg_irq\n"); dev_err(cdns->dev, "couldn't get otg_irq\n");
return ret; return ret;
@ -371,7 +370,7 @@ int cdns3_drd_init(struct cdns3 *cdns)
return -ENODEV; return -ENODEV;
} }
return ret; return 0;
} }
int cdns3_drd_exit(struct cdns3 *cdns) int cdns3_drd_exit(struct cdns3 *cdns)