i2c: don't print error when adding adapter fails
The core will do this for us now. Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com> Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com> Acked-by: Peter Korsgaard <peter@korsgaard.com> Acked-by: Heiko Stuebner <heiko@sntech.de> Acked-by: Neil Horman <nhorman@tuxdriver.com> Acked-by: Thierry Reding <treding@nvidia.com> Acked-by: Ray Jui <ray.jui@broadcom.com> Acked-by: Vladimir Zapolskiy <vz@mleia.com> Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com> Acked-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Acked-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
parent
fa8410b355
commit
ea734404f3
|
@ -378,11 +378,8 @@ static int amd756_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||
amd756_ioport);
|
||||
|
||||
error = i2c_add_adapter(&amd756_smbus);
|
||||
if (error) {
|
||||
dev_err(&pdev->dev,
|
||||
"Adapter registration failed, module not inserted\n");
|
||||
if (error)
|
||||
goto out_err;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -1122,8 +1122,6 @@ static int at91_twi_probe(struct platform_device *pdev)
|
|||
|
||||
rc = i2c_add_numbered_adapter(&dev->adapter);
|
||||
if (rc) {
|
||||
dev_err(dev->dev, "Adapter %s registration failed\n",
|
||||
dev->adapter.name);
|
||||
clk_disable_unprepare(dev->clk);
|
||||
|
||||
pm_runtime_disable(dev->dev);
|
||||
|
|
|
@ -558,13 +558,7 @@ static int axxia_i2c_probe(struct platform_device *pdev)
|
|||
|
||||
platform_set_drvdata(pdev, idev);
|
||||
|
||||
ret = i2c_add_adapter(&idev->adapter);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "failed to add adapter\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return i2c_add_adapter(&idev->adapter);
|
||||
}
|
||||
|
||||
static int axxia_i2c_remove(struct platform_device *pdev)
|
||||
|
|
|
@ -488,13 +488,7 @@ static int bcm_iproc_i2c_probe(struct platform_device *pdev)
|
|||
adap->dev.parent = &pdev->dev;
|
||||
adap->dev.of_node = pdev->dev.of_node;
|
||||
|
||||
ret = i2c_add_adapter(adap);
|
||||
if (ret) {
|
||||
dev_err(iproc_i2c->device, "failed to add adapter\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return i2c_add_adapter(adap);
|
||||
}
|
||||
|
||||
static int bcm_iproc_i2c_remove(struct platform_device *pdev)
|
||||
|
|
|
@ -858,10 +858,8 @@ static int bcm_kona_i2c_probe(struct platform_device *pdev)
|
|||
adap->dev.of_node = pdev->dev.of_node;
|
||||
|
||||
rc = i2c_add_adapter(adap);
|
||||
if (rc) {
|
||||
dev_err(dev->device, "failed to add adapter\n");
|
||||
if (rc)
|
||||
return rc;
|
||||
}
|
||||
|
||||
dev_info(dev->device, "device registered successfully\n");
|
||||
|
||||
|
|
|
@ -685,10 +685,8 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
|
|||
write_CONTROL(iface, read_CONTROL(iface) | TWI_ENA);
|
||||
|
||||
rc = i2c_add_numbered_adapter(p_adap);
|
||||
if (rc < 0) {
|
||||
dev_err(&pdev->dev, "Can't add i2c adapter!\n");
|
||||
if (rc < 0)
|
||||
goto out_error;
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, iface);
|
||||
|
||||
|
|
|
@ -648,10 +648,8 @@ static int brcmstb_i2c_probe(struct platform_device *pdev)
|
|||
adap->dev.parent = &pdev->dev;
|
||||
adap->dev.of_node = pdev->dev.of_node;
|
||||
rc = i2c_add_adapter(adap);
|
||||
if (rc) {
|
||||
dev_err(dev->device, "failed to add adapter\n");
|
||||
if (rc)
|
||||
goto probe_errorout;
|
||||
}
|
||||
|
||||
dev_info(dev->device, "%s@%dhz registered in %s mode\n",
|
||||
int_name ? int_name : " ", dev->clk_freq_hz,
|
||||
|
|
|
@ -963,10 +963,8 @@ static int cdns_i2c_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
ret = i2c_add_adapter(&id->adap);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "reg adap failed: %d\n", ret);
|
||||
if (ret < 0)
|
||||
goto err_clk_dis;
|
||||
}
|
||||
|
||||
/*
|
||||
* Cadence I2C controller has a bug wherein it generates
|
||||
|
|
|
@ -665,10 +665,8 @@ static int cpm_i2c_probe(struct platform_device *ofdev)
|
|||
cpm->adap.nr = (data && len == 4) ? be32_to_cpup(data) : -1;
|
||||
result = i2c_add_numbered_adapter(&cpm->adap);
|
||||
|
||||
if (result < 0) {
|
||||
dev_err(&ofdev->dev, "Unable to register with I2C\n");
|
||||
if (result < 0)
|
||||
goto out_shut;
|
||||
}
|
||||
|
||||
dev_dbg(&ofdev->dev, "hw routines for %s registered.\n",
|
||||
cpm->adap.name);
|
||||
|
|
|
@ -281,10 +281,8 @@ static int ec_i2c_probe(struct platform_device *pdev)
|
|||
bus->adap.retries = I2C_MAX_RETRIES;
|
||||
|
||||
err = i2c_add_adapter(&bus->adap);
|
||||
if (err) {
|
||||
dev_err(dev, "cannot register i2c adapter\n");
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
platform_set_drvdata(pdev, bus);
|
||||
|
||||
return err;
|
||||
|
|
|
@ -846,10 +846,8 @@ static int davinci_i2c_probe(struct platform_device *pdev)
|
|||
|
||||
adap->nr = pdev->id;
|
||||
r = i2c_add_numbered_adapter(adap);
|
||||
if (r) {
|
||||
dev_err(&pdev->dev, "failure adding adapter\n");
|
||||
if (r)
|
||||
goto err_unuse_clocks;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -487,10 +487,8 @@ static int diolan_u2c_probe(struct usb_interface *interface,
|
|||
|
||||
/* and finally attach to i2c layer */
|
||||
ret = i2c_add_adapter(&dev->adapter);
|
||||
if (ret < 0) {
|
||||
dev_err(&interface->dev, "failed to add I2C adapter\n");
|
||||
if (ret < 0)
|
||||
goto error_free;
|
||||
}
|
||||
|
||||
dev_dbg(&interface->dev, "connected " DRIVER_NAME "\n");
|
||||
|
||||
|
|
|
@ -228,10 +228,8 @@ static int dln2_i2c_probe(struct platform_device *pdev)
|
|||
|
||||
/* and finally attach to i2c layer */
|
||||
ret = i2c_add_adapter(&dln2->adapter);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "failed to add I2C adapter: %d\n", ret);
|
||||
if (ret < 0)
|
||||
goto out_disable;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -438,7 +438,6 @@ static int efm32_i2c_probe(struct platform_device *pdev)
|
|||
|
||||
ret = i2c_add_adapter(&ddata->adapter);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "failed to add i2c adapter (%d)\n", ret);
|
||||
free_irq(ddata->irq, ddata);
|
||||
|
||||
err_disable_clk:
|
||||
|
|
|
@ -796,10 +796,8 @@ static int exynos5_i2c_probe(struct platform_device *pdev)
|
|||
exynos5_i2c_reset(i2c);
|
||||
|
||||
ret = i2c_add_adapter(&i2c->adap);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "failed to add bus to i2c core\n");
|
||||
if (ret < 0)
|
||||
goto err_clk;
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, i2c);
|
||||
|
||||
|
|
|
@ -478,10 +478,8 @@ static int hix5hd2_i2c_probe(struct platform_device *pdev)
|
|||
pm_runtime_enable(priv->dev);
|
||||
|
||||
ret = i2c_add_adapter(&priv->adap);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "failed to add bus to i2c core\n");
|
||||
if (ret < 0)
|
||||
goto err_runtime;
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
||||
|
|
|
@ -1613,7 +1613,6 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
|||
"SMBus I801 adapter at %04lx", priv->smba);
|
||||
err = i2c_add_adapter(&priv->adapter);
|
||||
if (err) {
|
||||
dev_err(&dev->dev, "Failed to add SMBus adapter\n");
|
||||
i801_acpi_remove(priv);
|
||||
return err;
|
||||
}
|
||||
|
|
|
@ -751,10 +751,8 @@ static int iic_probe(struct platform_device *ofdev)
|
|||
adap->timeout = HZ;
|
||||
|
||||
ret = i2c_add_adapter(adap);
|
||||
if (ret < 0) {
|
||||
dev_err(&ofdev->dev, "failed to register i2c adapter\n");
|
||||
if (ret < 0)
|
||||
goto error_cleanup;
|
||||
}
|
||||
|
||||
dev_info(&ofdev->dev, "using %s mode\n",
|
||||
dev->fast_mode ? "fast (400 kHz)" : "standard (100 kHz)");
|
||||
|
|
|
@ -1394,10 +1394,8 @@ static int img_i2c_probe(struct platform_device *pdev)
|
|||
goto disable_clk;
|
||||
|
||||
ret = i2c_add_numbered_adapter(&i2c->adap);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "failed to add adapter\n");
|
||||
if (ret < 0)
|
||||
goto disable_clk;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -1129,10 +1129,8 @@ static int i2c_imx_probe(struct platform_device *pdev)
|
|||
|
||||
/* Add I2C adapter */
|
||||
ret = i2c_add_numbered_adapter(&i2c_imx->adapter);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "registration failed\n");
|
||||
if (ret < 0)
|
||||
goto rpm_disable;
|
||||
}
|
||||
|
||||
pm_runtime_mark_last_busy(&pdev->dev);
|
||||
pm_runtime_put_autosuspend(&pdev->dev);
|
||||
|
|
|
@ -288,10 +288,8 @@ static int smbus_sch_probe(struct platform_device *dev)
|
|||
"SMBus SCH adapter at %04x", sch_smba);
|
||||
|
||||
retval = i2c_add_adapter(&sch_adapter);
|
||||
if (retval) {
|
||||
dev_err(&dev->dev, "Couldn't register adapter!\n");
|
||||
if (retval)
|
||||
sch_smba = 0;
|
||||
}
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
|
|
@ -922,10 +922,8 @@ ismt_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||
return err;
|
||||
|
||||
err = i2c_add_adapter(&priv->adapter);
|
||||
if (err) {
|
||||
dev_err(&pdev->dev, "Failed to add SMBus iSMT adapter\n");
|
||||
if (err)
|
||||
return -ENODEV;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -798,10 +798,8 @@ static int jz4780_i2c_probe(struct platform_device *pdev)
|
|||
goto err;
|
||||
|
||||
ret = i2c_add_adapter(&i2c->adap);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "Failed to add bus\n");
|
||||
if (ret < 0)
|
||||
goto err;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -432,10 +432,8 @@ static int i2c_lpc2k_probe(struct platform_device *pdev)
|
|||
i2c->adap.dev.of_node = pdev->dev.of_node;
|
||||
|
||||
ret = i2c_add_adapter(&i2c->adap);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "failed to add adapter!\n");
|
||||
if (ret < 0)
|
||||
goto fail_clk;
|
||||
}
|
||||
|
||||
dev_info(&pdev->dev, "LPC2K I2C adapter\n");
|
||||
|
||||
|
|
|
@ -453,7 +453,6 @@ static int meson_i2c_probe(struct platform_device *pdev)
|
|||
|
||||
ret = i2c_add_adapter(&i2c->adap);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "can't register adapter\n");
|
||||
clk_unprepare(i2c->clk);
|
||||
return ret;
|
||||
}
|
||||
|
|
|
@ -737,10 +737,8 @@ static int fsl_i2c_probe(struct platform_device *op)
|
|||
i2c->adap.dev.of_node = of_node_get(op->dev.of_node);
|
||||
|
||||
result = i2c_add_adapter(&i2c->adap);
|
||||
if (result < 0) {
|
||||
dev_err(i2c->dev, "failed to add adapter\n");
|
||||
if (result < 0)
|
||||
goto fail_add;
|
||||
}
|
||||
|
||||
return result;
|
||||
|
||||
|
|
|
@ -786,10 +786,8 @@ static int mtk_i2c_probe(struct platform_device *pdev)
|
|||
|
||||
i2c_set_adapdata(&i2c->adap, i2c);
|
||||
ret = i2c_add_adapter(&i2c->adap);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "Failed to add i2c bus to i2c core\n");
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, i2c);
|
||||
|
||||
|
|
|
@ -868,7 +868,6 @@ static int mxs_i2c_probe(struct platform_device *pdev)
|
|||
i2c_set_adapdata(adap, i2c);
|
||||
err = i2c_add_numbered_adapter(adap);
|
||||
if (err) {
|
||||
dev_err(dev, "Failed to add adapter (%d)\n", err);
|
||||
writel(MXS_I2C_CTRL0_SFTRST,
|
||||
i2c->regs + MXS_I2C_CTRL0_SET);
|
||||
return err;
|
||||
|
|
|
@ -366,7 +366,6 @@ static int nforce2_probe_smb(struct pci_dev *dev, int bar, int alt_reg,
|
|||
|
||||
error = i2c_add_adapter(&smbus->adapter);
|
||||
if (error) {
|
||||
dev_err(&smbus->adapter.dev, "Failed to register adapter.\n");
|
||||
release_region(smbus->base, smbus->size);
|
||||
return error;
|
||||
}
|
||||
|
|
|
@ -1046,10 +1046,8 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
|
|||
adap->name, dev->virtbase);
|
||||
|
||||
ret = i2c_add_adapter(adap);
|
||||
if (ret) {
|
||||
dev_err(&adev->dev, "failed to add adapter\n");
|
||||
if (ret)
|
||||
goto err_no_adap;
|
||||
}
|
||||
|
||||
pm_runtime_put(&adev->dev);
|
||||
|
||||
|
|
|
@ -494,10 +494,8 @@ static int ocores_i2c_probe(struct platform_device *pdev)
|
|||
|
||||
/* add i2c adapter to i2c tree */
|
||||
ret = i2c_add_adapter(&i2c->adap);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "Failed to add adapter\n");
|
||||
if (ret)
|
||||
goto err_clk;
|
||||
}
|
||||
|
||||
/* add in known devices to the bus */
|
||||
if (pdata) {
|
||||
|
|
|
@ -1213,10 +1213,8 @@ static int octeon_i2c_probe(struct platform_device *pdev)
|
|||
platform_set_drvdata(pdev, i2c);
|
||||
|
||||
result = i2c_add_adapter(&i2c->adap);
|
||||
if (result < 0) {
|
||||
dev_err(i2c->dev, "failed to add adapter\n");
|
||||
if (result < 0)
|
||||
goto out;
|
||||
}
|
||||
dev_info(i2c->dev, "probed\n");
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -1425,10 +1425,8 @@ omap_i2c_probe(struct platform_device *pdev)
|
|||
/* i2c device drivers may be active on return from add_adapter() */
|
||||
adap->nr = pdev->id;
|
||||
r = i2c_add_numbered_adapter(adap);
|
||||
if (r) {
|
||||
dev_err(omap->dev, "failure adding adapter\n");
|
||||
if (r)
|
||||
goto err_unuse_clocks;
|
||||
}
|
||||
|
||||
dev_info(omap->dev, "bus %d rev%d.%d at %d kHz\n", adap->nr,
|
||||
major, minor, omap->speed);
|
||||
|
|
|
@ -694,7 +694,6 @@ static int piix4_add_adapter(struct pci_dev *dev, unsigned short smba,
|
|||
|
||||
retval = i2c_add_adapter(adap);
|
||||
if (retval) {
|
||||
dev_err(&dev->dev, "Couldn't register adapter!\n");
|
||||
kfree(adapdata);
|
||||
kfree(adap);
|
||||
release_region(smba, SMBIOSIZE);
|
||||
|
|
|
@ -329,10 +329,8 @@ static int pmcmsptwi_probe(struct platform_device *pldev)
|
|||
i2c_set_adapdata(&pmcmsptwi_adapter, &pmcmsptwi_data);
|
||||
|
||||
rc = i2c_add_adapter(&pmcmsptwi_adapter);
|
||||
if (rc) {
|
||||
dev_err(&pldev->dev, "Unable to register I2C adapter\n");
|
||||
if (rc)
|
||||
goto ret_unmap;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -714,10 +714,8 @@ static int i2c_pnx_probe(struct platform_device *pdev)
|
|||
|
||||
/* Register this adapter with the I2C subsystem */
|
||||
ret = i2c_add_numbered_adapter(&alg_data->adapter);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "I2C: Failed to add bus\n");
|
||||
if (ret < 0)
|
||||
goto out_clock;
|
||||
}
|
||||
|
||||
dev_dbg(&pdev->dev, "%s: Master at %#8x, irq %d.\n",
|
||||
alg_data->adapter.name, res->start, alg_data->irq);
|
||||
|
|
|
@ -212,11 +212,8 @@ static int puv3_i2c_probe(struct platform_device *pdev)
|
|||
|
||||
adapter->nr = pdev->id;
|
||||
rc = i2c_add_numbered_adapter(adapter);
|
||||
if (rc) {
|
||||
dev_err(&pdev->dev, "Adapter '%s' registration failed\n",
|
||||
adapter->name);
|
||||
if (rc)
|
||||
goto fail_add_adapter;
|
||||
}
|
||||
|
||||
dev_info(&pdev->dev, "PKUnity v3 i2c bus adapter.\n");
|
||||
return 0;
|
||||
|
|
|
@ -1292,10 +1292,8 @@ static int i2c_pxa_probe(struct platform_device *dev)
|
|||
#endif
|
||||
|
||||
ret = i2c_add_numbered_adapter(&i2c->adap);
|
||||
if (ret < 0) {
|
||||
dev_err(&dev->dev, "failed to add bus: %d\n", ret);
|
||||
if (ret < 0)
|
||||
goto ereqirq;
|
||||
}
|
||||
|
||||
platform_set_drvdata(dev, i2c);
|
||||
|
||||
|
|
|
@ -875,10 +875,8 @@ static int rcar_i2c_probe(struct platform_device *pdev)
|
|||
platform_set_drvdata(pdev, priv);
|
||||
|
||||
ret = i2c_add_numbered_adapter(adap);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "reg adap failed: %d\n", ret);
|
||||
if (ret < 0)
|
||||
goto out_pm_disable;
|
||||
}
|
||||
|
||||
dev_info(dev, "probed\n");
|
||||
|
||||
|
|
|
@ -383,10 +383,8 @@ static int riic_i2c_probe(struct platform_device *pdev)
|
|||
|
||||
|
||||
ret = i2c_add_adapter(adap);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "failed to add adapter\n");
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, riic);
|
||||
|
||||
|
|
|
@ -1303,10 +1303,8 @@ static int rk3x_i2c_probe(struct platform_device *pdev)
|
|||
rk3x_i2c_adapt_div(i2c, clk_rate);
|
||||
|
||||
ret = i2c_add_adapter(&i2c->adap);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "Could not register adapter\n");
|
||||
if (ret < 0)
|
||||
goto err_clk_notifier;
|
||||
}
|
||||
|
||||
dev_info(&pdev->dev, "Initialized RK3xxx I2C bus at %p\n", i2c->regs);
|
||||
|
||||
|
|
|
@ -1215,7 +1215,6 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
|
|||
|
||||
ret = i2c_add_numbered_adapter(&i2c->adap);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "failed to add bus to i2c core\n");
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
s3c24xx_i2c_deregister_cpufreq(i2c);
|
||||
clk_unprepare(i2c->clk);
|
||||
|
|
|
@ -510,10 +510,8 @@ static int sh7760_i2c_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
ret = i2c_add_numbered_adapter(&id->adap);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "reg adap failed: %d\n", ret);
|
||||
if (ret < 0)
|
||||
goto out4;
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, id);
|
||||
|
||||
|
|
|
@ -981,7 +981,6 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
|
|||
ret = i2c_add_numbered_adapter(adap);
|
||||
if (ret < 0) {
|
||||
sh_mobile_i2c_release_dma(pd);
|
||||
dev_err(&dev->dev, "cannot add numbered adapter\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -387,10 +387,8 @@ static int i2c_sirfsoc_probe(struct platform_device *pdev)
|
|||
writel(regval, siic->base + SIRFSOC_I2C_SDA_DELAY);
|
||||
|
||||
err = i2c_add_numbered_adapter(adap);
|
||||
if (err < 0) {
|
||||
dev_err(&pdev->dev, "Can't add new i2c adapter\n");
|
||||
if (err < 0)
|
||||
goto out;
|
||||
}
|
||||
|
||||
clk_disable(clk);
|
||||
|
||||
|
|
|
@ -874,10 +874,8 @@ static int st_i2c_probe(struct platform_device *pdev)
|
|||
init_completion(&i2c_dev->complete);
|
||||
|
||||
ret = i2c_add_adapter(adap);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "Failed to add adapter\n");
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, i2c_dev);
|
||||
|
||||
|
|
|
@ -920,11 +920,8 @@ static int stu300_probe(struct platform_device *pdev)
|
|||
|
||||
/* i2c device drivers may be active on return from add_adapter() */
|
||||
ret = i2c_add_numbered_adapter(adap);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "failure adding ST Micro DDC "
|
||||
"I2C adapter\n");
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, dev);
|
||||
dev_info(&pdev->dev, "ST DDC I2C @ %p, irq %d\n",
|
||||
|
|
|
@ -932,10 +932,8 @@ static int tegra_i2c_probe(struct platform_device *pdev)
|
|||
i2c_dev->adapter.dev.of_node = pdev->dev.of_node;
|
||||
|
||||
ret = i2c_add_numbered_adapter(&i2c_dev->adapter);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "Failed to add I2C adapter\n");
|
||||
if (ret)
|
||||
goto disable_div_clk;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -432,10 +432,8 @@ static int wmt_i2c_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
err = i2c_add_adapter(adap);
|
||||
if (err) {
|
||||
dev_err(&pdev->dev, "failed to add adapter\n");
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, i2c_dev);
|
||||
|
||||
|
|
|
@ -418,7 +418,6 @@ static int xgene_slimpro_i2c_probe(struct platform_device *pdev)
|
|||
i2c_set_adapdata(adapter, ctx);
|
||||
rc = i2c_add_adapter(adapter);
|
||||
if (rc) {
|
||||
dev_err(&pdev->dev, "Adapter registeration failed\n");
|
||||
mbox_free_channel(ctx->mbox_chan);
|
||||
return rc;
|
||||
}
|
||||
|
|
|
@ -804,7 +804,6 @@ static int xiic_i2c_probe(struct platform_device *pdev)
|
|||
/* add i2c adapter to i2c tree */
|
||||
ret = i2c_add_adapter(&i2c->adap);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "Failed to add adapter\n");
|
||||
xiic_deinit(i2c);
|
||||
goto err_clk_dis;
|
||||
}
|
||||
|
|
|
@ -400,10 +400,8 @@ static int xlp9xx_i2c_probe(struct platform_device *pdev)
|
|||
i2c_set_adapdata(&priv->adapter, priv);
|
||||
|
||||
err = i2c_add_adapter(&priv->adapter);
|
||||
if (err) {
|
||||
dev_err(&pdev->dev, "failed to add I2C adapter!\n");
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, priv);
|
||||
dev_dbg(&pdev->dev, "I2C bus:%d added\n", priv->adapter.nr);
|
||||
|
|
|
@ -432,10 +432,8 @@ static int xlr_i2c_probe(struct platform_device *pdev)
|
|||
|
||||
i2c_set_adapdata(&priv->adap, priv);
|
||||
ret = i2c_add_numbered_adapter(&priv->adap);
|
||||
if (ret < 0) {
|
||||
dev_err(&priv->adap.dev, "Failed to add i2c bus.\n");
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
|
||||
platform_set_drvdata(pdev, priv);
|
||||
dev_info(&priv->adap.dev, "Added I2C Bus.\n");
|
||||
|
|
Loading…
Reference in a new issue