Hi Philipp, I'm a bit confused: I only see patches 3, 4 and 5 of 14 and no cover letter, and I don't think I ever saw a v1 of this patch series on linux-media. I assume this is a patch series covering multiple subsystems? This patch looks good and I'm happy to take it for 4.12, I just want to make sure I didn't miss anything. Regards, Hans On 03/15/2017 12:31 PM, Philipp Zabel wrote: > As of commit bb475230b8e5 ("reset: make optional functions really > optional"), the reset framework API calls use NULL pointers to > describe optional, non-present reset controls. > > This allows to return errors from devm_reset_control_get_optional > without special cases and to call reset_control_reset unconditionally. > > Signed-off-by: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx> > --- > drivers/media/platform/coda/coda-common.c | 12 +++--------- > 1 file changed, 3 insertions(+), 9 deletions(-) > > diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c > index eb6548f46cbac..0cf667ab44bfb 100644 > --- a/drivers/media/platform/coda/coda-common.c > +++ b/drivers/media/platform/coda/coda-common.c > @@ -1982,8 +1982,7 @@ static int coda_hw_init(struct coda_dev *dev) > if (ret) > goto err_clk_ahb; > > - if (dev->rstc) > - reset_control_reset(dev->rstc); > + reset_control_reset(dev->rstc); > > /* > * Copy the first CODA_ISRAM_SIZE in the internal SRAM. > @@ -2362,13 +2361,8 @@ static int coda_probe(struct platform_device *pdev) > dev->rstc = devm_reset_control_get_optional(&pdev->dev, NULL); > if (IS_ERR(dev->rstc)) { > ret = PTR_ERR(dev->rstc); > - if (ret == -ENOENT || ret == -ENOTSUPP) { > - dev->rstc = NULL; > - } else { > - dev_err(&pdev->dev, "failed get reset control: %d\n", > - ret); > - return ret; > - } > + dev_err(&pdev->dev, "failed get reset control: %d\n", ret); > + return ret; > } > > /* Get IRAM pool from device tree or platform data */ >