Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp1282915rwb; Fri, 19 Aug 2022 00:21:22 -0700 (PDT) X-Google-Smtp-Source: AA6agR4TNcvbPzhCnISPAppn8ovLizzWy1qlRoiiSahUS+itu/JWmLOeiU9aH73kx1T+z05jFFfJ X-Received: by 2002:a63:6344:0:b0:42a:498d:2b1e with SMTP id x65-20020a636344000000b0042a498d2b1emr455730pgb.618.1660893682772; Fri, 19 Aug 2022 00:21:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660893682; cv=none; d=google.com; s=arc-20160816; b=aoLWpPN8gp7ktmflDtzM7wKUK/7I+QC4zCTMcvi2vXimLDhwoVWqZXx8dCb1MGZJiN H9yZpYYiezkO4feBsm7OTP27cOYQ3IKd1kDWeJI6Y3zeifeR5Re7kO3j0b8zx6h16nyH gvfitml9jg7Sxe/qI7fnLm3bXr5NKujfmlMAaENJGe1NX/HrboqmXdYnbjtpjNloPbFK ZCEP6M4I6prKV5bIDWEKMw7MwvrN3AKAs/4D26vKajKCx2dzWPa+/w6ydyMbRgwJJxHz CM+2gZTcKN7+NXh64akPbV85nhOU9RNa2UqJwb87xhIKsqRCRMeRWLULHleXTe2gRGmQ FWdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=x7NREdYEcMebSB/cJV0E2dh3XuuCwOTGnnbb+8QrwAc=; b=aD3ryqOFNBZASoeT7UHXvoepDqr6z0QDUtL6pjbiTJsVdWvI/3H308aTOvhIQccmeU cBjx56EjX3GECP1k9pxgPtIUNUH6CH7Wz3nnwSYkFaF4QIMVOC/FamQCA3OO07g1St+3 SUg7OAh0gCPDpxvGCCheQDW9H0UIxi0mZgsmLehRlAvKwhqeD5mx9jDbJgyamMOu3zaj f1GXZ8mFCdffpfuTeE9vEqY7jm+q+cSQZqoD4LrRdN3SL9x70CX1/U9xaaK+BlsM9nVn DbYGcoxrW3NzNAPG8SjAMmVQE5QMSPJD5PGqUgSxJy+zgGaXVYuAWJ/HMWhuO0DCQ/K+ YfNw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k20-20020a17090aaa1400b001f534082156si3145776pjq.183.2022.08.19.00.21.11; Fri, 19 Aug 2022 00:21:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346941AbiHSHQd (ORCPT + 99 others); Fri, 19 Aug 2022 03:16:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237247AbiHSHQb (ORCPT ); Fri, 19 Aug 2022 03:16:31 -0400 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::221]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72471E2C54; Fri, 19 Aug 2022 00:16:29 -0700 (PDT) Received: (Authenticated sender: jacopo@jmondi.org) by mail.gandi.net (Postfix) with ESMTPSA id 792EC240003; Fri, 19 Aug 2022 07:16:21 +0000 (UTC) Date: Fri, 19 Aug 2022 09:16:19 +0200 From: Jacopo Mondi To: Marco Felsch Cc: mchehab@kernel.org, sakari.ailus@linux.intel.com, laurent.pinchart+renesas@ideasonboard.com, jacopo+renesas@jmondi.org, akinobu.mita@gmail.com, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: Re: [PATCH 2/4] media: mt9m111: fix subdev API usage Message-ID: <20220819071619.brhhbypmnt5pr2f7@uno.localdomain> References: <20220818144712.997477-1-m.felsch@pengutronix.de> <20220818144712.997477-2-m.felsch@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20220818144712.997477-2-m.felsch@pengutronix.de> X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Marco On Thu, Aug 18, 2022 at 04:47:10PM +0200, Marco Felsch wrote: > In case of I2C transfer failures the driver return failure codes which > are not allowed according the API documentation. Fix that by ignore the > register access failure codes. I might have missed the reason why subdev ops are not allowed to fail.. Also you're here changing both subdev ops handler and function that handle controls if I'm not mistaken. > > Signed-off-by: Marco Felsch > --- > drivers/media/i2c/mt9m111.c | 116 ++++++++++++++++++++---------------- > 1 file changed, 66 insertions(+), 50 deletions(-) > > diff --git a/drivers/media/i2c/mt9m111.c b/drivers/media/i2c/mt9m111.c > index cdaf283e1309..53c4dac4e4bd 100644 > --- a/drivers/media/i2c/mt9m111.c > +++ b/drivers/media/i2c/mt9m111.c > @@ -455,7 +455,7 @@ static int mt9m111_set_selection(struct v4l2_subdev *sd, > struct mt9m111 *mt9m111 = to_mt9m111(client); > struct v4l2_rect rect = sel->r; > int width, height; > - int ret, align = 0; > + int align = 0; > > if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE || > sel->target != V4L2_SEL_TGT_CROP) > @@ -481,14 +481,13 @@ static int mt9m111_set_selection(struct v4l2_subdev *sd, > width = min(mt9m111->width, rect.width); > height = min(mt9m111->height, rect.height); > > - ret = mt9m111_setup_geometry(mt9m111, &rect, width, height, mt9m111->fmt->code); > - if (!ret) { > - mt9m111->rect = rect; > - mt9m111->width = width; > - mt9m111->height = height; > - } > > - return ret; > + mt9m111_setup_geometry(mt9m111, &rect, width, height, mt9m111->fmt->code); > + mt9m111->rect = rect; > + mt9m111->width = width; > + mt9m111->height = height; > + > + return 0; > } > > static int mt9m111_get_selection(struct v4l2_subdev *sd, > @@ -558,7 +557,6 @@ static int mt9m111_set_pixfmt(struct mt9m111 *mt9m111, > MT9M111_OUTFMT_RGB444x | MT9M111_OUTFMT_RGBx444 | > MT9M111_OUTFMT_SWAP_YCbCr_C_Y_RGB_EVEN | > MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr_RGB_R_B; > - int ret; > > switch (code) { > case MEDIA_BUS_FMT_SBGGR8_1X8: > @@ -613,13 +611,13 @@ static int mt9m111_set_pixfmt(struct mt9m111 *mt9m111, > if (mt9m111->pclk_sample == 0) > mask_outfmt2 |= MT9M111_OUTFMT_INV_PIX_CLOCK; > > - ret = mt9m111_reg_mask(client, context_a.output_fmt_ctrl2, > - data_outfmt2, mask_outfmt2); > - if (!ret) > - ret = mt9m111_reg_mask(client, context_b.output_fmt_ctrl2, > - data_outfmt2, mask_outfmt2); > > - return ret; > + mt9m111_reg_mask(client, context_a.output_fmt_ctrl2, > + data_outfmt2, mask_outfmt2); > + mt9m111_reg_mask(client, context_b.output_fmt_ctrl2, > + data_outfmt2, mask_outfmt2); > + > + return 0; > } > > static int mt9m111_set_fmt(struct v4l2_subdev *sd, > @@ -632,7 +630,6 @@ static int mt9m111_set_fmt(struct v4l2_subdev *sd, > const struct mt9m111_datafmt *fmt; > struct v4l2_rect *rect = &mt9m111->rect; > bool bayer; > - int ret; > > if (mt9m111->is_streaming) > return -EBUSY; > @@ -681,16 +678,14 @@ static int mt9m111_set_fmt(struct v4l2_subdev *sd, > return 0; > } > > - ret = mt9m111_setup_geometry(mt9m111, rect, mf->width, mf->height, mf->code); > - if (!ret) > - ret = mt9m111_set_pixfmt(mt9m111, mf->code); > - if (!ret) { > - mt9m111->width = mf->width; > - mt9m111->height = mf->height; > - mt9m111->fmt = fmt; > - } > > - return ret; > + mt9m111_setup_geometry(mt9m111, rect, mf->width, mf->height, mf->code); > + mt9m111_set_pixfmt(mt9m111, mf->code); > + mt9m111->width = mf->width; > + mt9m111->height = mf->height; > + mt9m111->fmt = fmt; > + > + return 0; > } > > static const struct mt9m111_mode_info * > @@ -786,14 +781,13 @@ static int mt9m111_s_register(struct v4l2_subdev *sd, > static int mt9m111_set_flip(struct mt9m111 *mt9m111, int flip, int mask) > { > struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev); > - int ret; > > if (flip) > - ret = mt9m111_reg_set(client, mt9m111->ctx->read_mode, mask); > + mt9m111_reg_set(client, mt9m111->ctx->read_mode, mask); > else > - ret = mt9m111_reg_clear(client, mt9m111->ctx->read_mode, mask); > + mt9m111_reg_clear(client, mt9m111->ctx->read_mode, mask); > > - return ret; > + return 0; > } > > static int mt9m111_get_global_gain(struct mt9m111 *mt9m111) > @@ -823,7 +817,9 @@ static int mt9m111_set_global_gain(struct mt9m111 *mt9m111, int gain) > else > val = gain; > > - return reg_write(GLOBAL_GAIN, val); > + reg_write(GLOBAL_GAIN, val); > + > + return 0; > } > > static int mt9m111_set_autoexposure(struct mt9m111 *mt9m111, int val) > @@ -831,8 +827,11 @@ static int mt9m111_set_autoexposure(struct mt9m111 *mt9m111, int val) > struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev); > > if (val == V4L2_EXPOSURE_AUTO) > - return reg_set(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOEXPO_EN); > - return reg_clear(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOEXPO_EN); > + reg_set(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOEXPO_EN); > + else > + reg_clear(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOEXPO_EN); > + > + return 0; > } > > static int mt9m111_set_autowhitebalance(struct mt9m111 *mt9m111, int on) > @@ -840,8 +839,11 @@ static int mt9m111_set_autowhitebalance(struct mt9m111 *mt9m111, int on) > struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev); > > if (on) > - return reg_set(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOWHITEBAL_EN); > - return reg_clear(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOWHITEBAL_EN); > + reg_set(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOWHITEBAL_EN); > + else > + reg_clear(OPER_MODE_CTRL, MT9M111_OPMODE_AUTOWHITEBAL_EN); > + > + return 0; > } > > static const char * const mt9m111_test_pattern_menu[] = { > @@ -859,8 +861,9 @@ static int mt9m111_set_test_pattern(struct mt9m111 *mt9m111, int val) > { > struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev); > > - return mt9m111_reg_mask(client, MT9M111_TPG_CTRL, val, > - MT9M111_TPG_SEL_MASK); > + mt9m111_reg_mask(client, MT9M111_TPG_CTRL, val, MT9M111_TPG_SEL_MASK); > + > + return 0; > } > > static int mt9m111_set_colorfx(struct mt9m111 *mt9m111, int val) > @@ -877,9 +880,10 @@ static int mt9m111_set_colorfx(struct mt9m111 *mt9m111, int val) > > for (i = 0; i < ARRAY_SIZE(colorfx); i++) { > if (colorfx[i].id == val) { > - return mt9m111_reg_mask(client, MT9M111_EFFECTS_MODE, > - colorfx[i].value, > - MT9M111_EFFECTS_MODE_MASK); > + mt9m111_reg_mask(client, MT9M111_EFFECTS_MODE, > + colorfx[i].value, > + MT9M111_EFFECTS_MODE_MASK); > + return 0; > } > } > > @@ -890,29 +894,41 @@ static int mt9m111_s_ctrl(struct v4l2_ctrl *ctrl) > { > struct mt9m111 *mt9m111 = container_of(ctrl->handler, > struct mt9m111, hdl); > + int ret; > > switch (ctrl->id) { > case V4L2_CID_VFLIP: > - return mt9m111_set_flip(mt9m111, ctrl->val, > - MT9M111_RMB_MIRROR_ROWS); > + ret = mt9m111_set_flip(mt9m111, ctrl->val, > + MT9M111_RMB_MIRROR_ROWS); > + break; > case V4L2_CID_HFLIP: > - return mt9m111_set_flip(mt9m111, ctrl->val, > - MT9M111_RMB_MIRROR_COLS); > + ret = mt9m111_set_flip(mt9m111, ctrl->val, > + MT9M111_RMB_MIRROR_COLS); > + break; > case V4L2_CID_GAIN: > - return mt9m111_set_global_gain(mt9m111, ctrl->val); > + ret = mt9m111_set_global_gain(mt9m111, ctrl->val); > + break; > case V4L2_CID_EXPOSURE_AUTO: > - return mt9m111_set_autoexposure(mt9m111, ctrl->val); > + ret = mt9m111_set_autoexposure(mt9m111, ctrl->val); > + break; > case V4L2_CID_AUTO_WHITE_BALANCE: > - return mt9m111_set_autowhitebalance(mt9m111, ctrl->val); > + ret = mt9m111_set_autowhitebalance(mt9m111, ctrl->val); > + break; > case V4L2_CID_TEST_PATTERN: > - return mt9m111_set_test_pattern(mt9m111, ctrl->val); > + ret = mt9m111_set_test_pattern(mt9m111, ctrl->val); > + break; > case V4L2_CID_COLORFX: > - return mt9m111_set_colorfx(mt9m111, ctrl->val); > + ret = mt9m111_set_colorfx(mt9m111, ctrl->val); > + break; > case V4L2_CID_PIXEL_RATE: > - return 0; > + ret = 0; > + break; > + default: > + ret = -EINVAL; > } > > - return -EINVAL; > + > + return ret; > } > > static int mt9m111_suspend(struct mt9m111 *mt9m111) > -- > 2.30.2 >