media: ov2740: Use traditional pattern when checking error codes
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 26 Jul 2022 12:05:56 +0000 (13:05 +0100)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Fri, 25 Nov 2022 08:40:05 +0000 (08:40 +0000)
Instead of 'if (!ret)' switch to "check for the error first" rule.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
drivers/media/i2c/ov2740.c

index 264a59913a89fcf4e5c7d698c2b812b35709e5f0..f3731f932a946167d08bee10bbd1cb9109e4229e 100644 (file)
@@ -1092,7 +1092,6 @@ static int ov2740_register_nvmem(struct i2c_client *client,
        struct nvmem_config nvmem_config = { };
        struct regmap *regmap;
        struct device *dev = &client->dev;
-       int ret;
 
        nvm = devm_kzalloc(dev, sizeof(*nvm), GFP_KERNEL);
        if (!nvm)
@@ -1122,12 +1121,11 @@ static int ov2740_register_nvmem(struct i2c_client *client,
        nvmem_config.size = CUSTOMER_USE_OTP_SIZE;
 
        nvm->nvmem = devm_nvmem_register(dev, &nvmem_config);
+       if (IS_ERR(nvm->nvmem))
+               return PTR_ERR(nvm->nvmem);
 
-       ret = PTR_ERR_OR_ZERO(nvm->nvmem);
-       if (!ret)
-               ov2740->nvm = nvm;
-
-       return ret;
+       ov2740->nvm = nvm;
+       return 0;
 }
 
 static int ov2740_probe(struct i2c_client *client)