ASoC: simple-card: Use snd_soc_of_parse_aux_devs()

[linux.git] / drivers / usb / cdns3 / core.c

diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
index 8e3996f211a85185a10ca61f69a19f247890c40f..5c1586ec78241cb474cf55bfa381ebf854dea3a4 100644 (file)
--- 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);
@@ -427,8 +423,7 @@ static int cdns3_probe(struct platform_device *pdev)
        if (cdns->dev_irq < 0)
                dev_err(dev, "couldn't get peripheral irq\n");
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dev");
-       regs = devm_ioremap_resource(dev, res);
+       regs = devm_platform_ioremap_resource_byname(pdev, "dev");
        if (IS_ERR(regs))
                return PTR_ERR(regs);
        cdns->dev_regs  = regs;