Message ID | 20231215082452.1720481-1-tomm.merciai@gmail.com |
---|---|
Headers |
Return-Path: <linux-kernel+bounces-612-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp9121172dys; Fri, 15 Dec 2023 00:25:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IFAuF59sCACMHESJqU+AjVcHuFqf6j/er6I0Ionj/cVjuu9Tyi1mV7Arg4pMGA7sVQf0d5o X-Received: by 2002:a05:6830:1297:b0:6d8:74e2:634e with SMTP id z23-20020a056830129700b006d874e2634emr10580872otp.40.1702628725020; Fri, 15 Dec 2023 00:25:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702628724; cv=none; d=google.com; s=arc-20160816; b=iTKdGyUReE7PG5F8yXdsW2MeqCpbgUWZaSod6hCU6NQkcsCEsey+qHdbCnUS1vQ8Fh LtpXc/gXqZcCBdoCNfzcEiTdS7+IOjYITg6/capiNYbEEVEOxx+LUFZ1XBwck4moNUwK knvaWGhXHvbwLpUPQC1x+lX9UVLDGSt8iqKRezSjgAjHqR+o4nJb5y9W9u2iRy6fUYQd ANbGv8RLR0WdudogpWr3r2Fs2BesFQiNYZFUtmS9edftwvzqrNCGYM/y5UI4+tyb/cKw gX9zvMnF/USQZJ8mPtq3OLTLx3gR36bSPPMAn+X48Zib+KAE3PuqIZ1xcCY4b/IhiBsv XCng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=NsXOuP1yxztbXsnzImFkfgn1DAayjDuR2ejrUR2SoFU=; fh=QTdZiDHA4VOqya5YEtWz1eoP1phH40Nxtf0DBXn+Bq8=; b=dnjeBWO4zf992qlpmXZBdPzBlIboeE9roQntNqfKNKpISzYSQSjrO3za0XHHnif0m9 07YywfteLCWWX564WRzjQGPLCaKenAZQqIsoNTyfEtkeTsLsof6YbpCx4K5xH1Xycpw0 NkiIDyxu0dYGBqOFs8idQeGoSl/Ufi0ZiE8u/27SuOVLGg8z6DTksG4dKI7KsDJ+JRQ3 y1xlVJ9gcQ4CjCOVLYSaoKN3pzVuno1XKVPkTHVfpNoxkVJdUv6XMJCG7G/ZP6qs7rlN /35ypfoar6Ar7U4zthvc4o+6nXWI/WFc5g+5jZeZkNYqLQDToMB3psFHk//rSX+D6fce 4LDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=m5EIbYB7; spf=pass (google.com: domain of linux-kernel+bounces-612-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-612-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id g32-20020a635220000000b005bf77518dc6si12572462pgb.286.2023.12.15.00.25.24 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 00:25:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-612-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=m5EIbYB7; spf=pass (google.com: domain of linux-kernel+bounces-612-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-612-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 8932528446C for <ouuuleilei@gmail.com>; Fri, 15 Dec 2023 08:25:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 011CB17734; Fri, 15 Dec 2023 08:25:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="m5EIbYB7" X-Original-To: linux-kernel@vger.kernel.org Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D4ADD1548D; Fri, 15 Dec 2023 08:24:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-a1e35c2807fso44471166b.3; Fri, 15 Dec 2023 00:24:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702628695; x=1703233495; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NsXOuP1yxztbXsnzImFkfgn1DAayjDuR2ejrUR2SoFU=; b=m5EIbYB7S8r0j5EttCrS4JrHkIzjr1N4ztJgL4xkFojtlnCDKLY1z7WmK1WDSk5+7j itzRQxsWhJNP9zPH0B0GQace3l+TBFFXWVfrwxxktdvaWjEO8s+a8Ui1GeydCdo+oUG2 xToA806szBkVfTt0DUrquLm+GRhGJtz40604Mt6AJmXQ1D72CNWCbj9ceXSklQwx6vUZ HspdNUXVKuInYMY/vY10FiFEPdHu2RfS39Cnno0KJzFUTgk2ikMu+w6oWrpgq1PQg3Vc rgi24yRtk3QyBunJGGl5xeBCZC/J1a5TiYVDT9pXcGL+Rytciv2vyjMYAAU9l8WCQSDW dzQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702628695; x=1703233495; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NsXOuP1yxztbXsnzImFkfgn1DAayjDuR2ejrUR2SoFU=; b=BOxNX6cbfBkGTueJRgOVBpVgpkhLgZ4KHz8OCd2FKT/4qvDxFVkSTVnxLkMCbXSRyU onISMMRzb2ojGbFDfU1HJfWl47XTGDouaALN/wclXjHzMpbqkTrc0MftB71Q+XwzG4pG 6KFeB25J/YCjPqUctpBVeBXHHHhJZpFmpcHzISOVr8SnT7ZYyKlx8OubaByD6JHeNf+X ESMBl4nwAGmVh0SN6bHqEVMCUPRywtjvmC6AeUCkOJZStBlhltStJMRVyJywBaiGlTX8 zGh3oYDu5tXcMvhx2vg/gaeyHD6HnOUFBI4V4jRpb0BQXRm5xmzlSPoZSu9i7/5VUE5C XsRg== X-Gm-Message-State: AOJu0Yy+OcPyJpeep/Qr/ZmYqY0C5h6a4WRLguTbhGIA0NWoOXoRvwq6 pnMIuS4IxgQ11T1GWY+WFoY= X-Received: by 2002:a17:906:474c:b0:a19:a1ba:da60 with SMTP id j12-20020a170906474c00b00a19a1bada60mr4859682ejs.135.1702628694901; Fri, 15 Dec 2023 00:24:54 -0800 (PST) Received: from tom-HP-ZBook-Fury-15-G7-Mobile-Workstation.station (net-188-217-59-229.cust.vodafonedsl.it. [188.217.59.229]) by smtp.gmail.com with ESMTPSA id un7-20020a170907cb8700b00a1b65249053sm10395951ejc.128.2023.12.15.00.24.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 00:24:54 -0800 (PST) From: Tommaso Merciai <tomm.merciai@gmail.com> To: Cc: linuxfancy@googlegroups.com, sakari.ailus@linux.intel.com, laurent.pinchart@ideasonboard.com, tomm.merciai@gmail.com, Martin Hecht <martin.hecht@avnet.eu>, Mauro Carvalho Chehab <mchehab@kernel.org>, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 0/3] media: i2c: alvium: store frame interval in subdev state Date: Fri, 15 Dec 2023 09:24:49 +0100 Message-Id: <20231215082452.1720481-1-tomm.merciai@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785335617743247471 X-GMAIL-MSGID: 1785335617743247471 |
Series |
media: i2c: alvium: store frame interval in subdev state
|
|
Message
Tommaso Merciai
Dec. 15, 2023, 8:24 a.m. UTC
Hi All, The goal of this series as suggested by LPinchart is to remove the following data from alvium_dev struct: - struct v4l2_fract frame_interval; - u64 dft_fr; - u64 min_fr; - u64 max_fr; - u64 fr; And use instead the the newly added storage for frame interval in the subdev state. This series is made on top of the following series: - media: v4l2-subdev: Improve frame interval handling - base-commit: 76cb0b74268f1347e4b7fdefc343b064410e0e10 Tommaso Merciai (3): media: i2c: alvium: removal of dft_fr, min_fr and max_fr media: i2c: alvium: inline set_frame_interval into s_frame_interval media: i2c: alvium: store frame interval in subdev state drivers/media/i2c/alvium-csi2.c | 91 ++++++++++----------------------- drivers/media/i2c/alvium-csi2.h | 5 -- 2 files changed, 28 insertions(+), 68 deletions(-)
Comments
Hi Tommaso, Thank you for the patch. On Fri, Dec 15, 2023 at 09:24:50AM +0100, Tommaso Merciai wrote: > Remove driver private data dft_fr, min_fr and max_fr. > Those are used only in alvium_set_frame_interval function. > Use local ones instead. The fields are used to pass data from alvium_get_frame_interval() to its caller, not just in alvium_get_frame_interval(). You can write The dft_fr, min_fr and max_fr fields of the alvium_dev structure are only used to pass results from alvium_get_frame_interval() to its caller. Replace them with function parameters. > Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> > --- > drivers/media/i2c/alvium-csi2.c | 45 +++++++++++++++------------------ > drivers/media/i2c/alvium-csi2.h | 3 --- > 2 files changed, 21 insertions(+), 27 deletions(-) > > diff --git a/drivers/media/i2c/alvium-csi2.c b/drivers/media/i2c/alvium-csi2.c > index 34ff7fad3877..c4b7851045a1 100644 > --- a/drivers/media/i2c/alvium-csi2.c > +++ b/drivers/media/i2c/alvium-csi2.c > @@ -1170,40 +1170,36 @@ static int alvium_set_bayer_pattern(struct alvium_dev *alvium, > return 0; > } > > -static int alvium_get_frame_interval(struct alvium_dev *alvium) > +static int alvium_get_frame_interval(struct alvium_dev *alvium, > + u64 *dft_fr, u64 *min_fr, u64 *max_fr) > { > - u64 dft_fr, min_fr, max_fr; > int ret = 0; > > alvium_read(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_RW, > - &dft_fr, &ret); > + dft_fr, &ret); > alvium_read(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_MIN_R, > - &min_fr, &ret); > + min_fr, &ret); > alvium_read(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_MAX_R, > - &max_fr, &ret); > + max_fr, &ret); > if (ret) > return ret; You can just return ret; > > - alvium->dft_fr = dft_fr; > - alvium->min_fr = min_fr; > - alvium->max_fr = max_fr; > - > return 0; > } > > -static int alvium_set_frame_rate(struct alvium_dev *alvium) > +static int alvium_set_frame_rate(struct alvium_dev *alvium, u64 fr) > { > struct device *dev = &alvium->i2c_client->dev; > int ret; > > ret = alvium_write_hshake(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_RW, > - alvium->fr); > + fr); This is unrelated to the commit message. Please split handling of the fr field to a separate patch. One change, one patch. > if (ret) { > dev_err(dev, "Fail to set frame rate lanes reg\n"); > return ret; > } > > - dev_dbg(dev, "set frame rate: %llu us\n", alvium->fr); > + dev_dbg(dev, "set frame rate: %llu us\n", fr); > > return 0; > } > @@ -1667,36 +1663,36 @@ static int alvium_g_frame_interval(struct v4l2_subdev *sd, > } > > static int alvium_set_frame_interval(struct alvium_dev *alvium, > - struct v4l2_subdev_frame_interval *fi) > + struct v4l2_subdev *sd, > + struct v4l2_subdev_state *sd_state, > + struct v4l2_subdev_frame_interval *fi, > + u64 *req_fr) > { > struct device *dev = &alvium->i2c_client->dev; > - u64 req_fr, min_fr, max_fr; > + u64 dft_fr, min_fr, max_fr; > int ret; > > if (fi->interval.denominator == 0) > return -EINVAL; > > - ret = alvium_get_frame_interval(alvium); > + ret = alvium_get_frame_interval(alvium, &dft_fr, &min_fr, &max_fr); > if (ret) { > dev_err(dev, "Fail to get frame interval\n"); > return ret; > } > > - min_fr = alvium->min_fr; > - max_fr = alvium->max_fr; > - > dev_dbg(dev, "fi->interval.numerator = %d\n", > fi->interval.numerator); > dev_dbg(dev, "fi->interval.denominator = %d\n", > fi->interval.denominator); > > - req_fr = (u64)((fi->interval.denominator * USEC_PER_SEC) / > + *req_fr = (u64)((fi->interval.denominator * USEC_PER_SEC) / > fi->interval.numerator); > > - if (req_fr >= max_fr && req_fr <= min_fr) > - req_fr = alvium->dft_fr; > + if (*req_fr >= max_fr && *req_fr <= min_fr) > + *req_fr = dft_fr; > > - alvium->fr = req_fr; > + alvium->fr = *req_fr; > alvium->frame_interval.numerator = fi->interval.numerator; > alvium->frame_interval.denominator = fi->interval.denominator; > > @@ -1708,6 +1704,7 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, > struct v4l2_subdev_frame_interval *fi) > { > struct alvium_dev *alvium = sd_to_alvium(sd); > + u64 req_fr; > int ret; > > /* > @@ -1720,9 +1717,9 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, > if (alvium->streaming) > return -EBUSY; > > - ret = alvium_set_frame_interval(alvium, fi); > + ret = alvium_set_frame_interval(alvium, sd, sd_state, fi, &req_fr); > if (!ret) > - ret = alvium_set_frame_rate(alvium); > + ret = alvium_set_frame_rate(alvium, req_fr); > > return ret; > } > diff --git a/drivers/media/i2c/alvium-csi2.h b/drivers/media/i2c/alvium-csi2.h > index 8b554bffdc39..a6529b28e7dd 100644 > --- a/drivers/media/i2c/alvium-csi2.h > +++ b/drivers/media/i2c/alvium-csi2.h > @@ -443,9 +443,6 @@ struct alvium_dev { > > struct alvium_mode mode; > struct v4l2_fract frame_interval; > - u64 dft_fr; > - u64 min_fr; > - u64 max_fr; > u64 fr; > > u8 h_sup_csi_lanes;
On Mon, Dec 18, 2023 at 04:50:46AM +0200, Laurent Pinchart wrote: > Hi Tommaso, > > Thank you for the patch. > > On Fri, Dec 15, 2023 at 09:24:50AM +0100, Tommaso Merciai wrote: > > Remove driver private data dft_fr, min_fr and max_fr. > > Those are used only in alvium_set_frame_interval function. > > Use local ones instead. > > The fields are used to pass data from alvium_get_frame_interval() to its > caller, not just in alvium_get_frame_interval(). You can write > > The dft_fr, min_fr and max_fr fields of the alvium_dev structure are > only used to pass results from alvium_get_frame_interval() to its > caller. Replace them with function parameters. > > > Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> > > --- > > drivers/media/i2c/alvium-csi2.c | 45 +++++++++++++++------------------ > > drivers/media/i2c/alvium-csi2.h | 3 --- > > 2 files changed, 21 insertions(+), 27 deletions(-) > > > > diff --git a/drivers/media/i2c/alvium-csi2.c b/drivers/media/i2c/alvium-csi2.c > > index 34ff7fad3877..c4b7851045a1 100644 > > --- a/drivers/media/i2c/alvium-csi2.c > > +++ b/drivers/media/i2c/alvium-csi2.c > > @@ -1170,40 +1170,36 @@ static int alvium_set_bayer_pattern(struct alvium_dev *alvium, > > return 0; > > } > > > > -static int alvium_get_frame_interval(struct alvium_dev *alvium) > > +static int alvium_get_frame_interval(struct alvium_dev *alvium, > > + u64 *dft_fr, u64 *min_fr, u64 *max_fr) > > { > > - u64 dft_fr, min_fr, max_fr; > > int ret = 0; > > > > alvium_read(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_RW, > > - &dft_fr, &ret); > > + dft_fr, &ret); > > alvium_read(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_MIN_R, > > - &min_fr, &ret); > > + min_fr, &ret); > > alvium_read(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_MAX_R, > > - &max_fr, &ret); > > + max_fr, &ret); > > if (ret) > > return ret; > > You can just > > return ret; > > > > > - alvium->dft_fr = dft_fr; > > - alvium->min_fr = min_fr; > > - alvium->max_fr = max_fr; > > - > > return 0; > > } > > > > -static int alvium_set_frame_rate(struct alvium_dev *alvium) > > +static int alvium_set_frame_rate(struct alvium_dev *alvium, u64 fr) > > { > > struct device *dev = &alvium->i2c_client->dev; > > int ret; > > > > ret = alvium_write_hshake(alvium, REG_BCRM_ACQUISITION_FRAME_RATE_RW, > > - alvium->fr); > > + fr); > > This is unrelated to the commit message. Please split handling of the fr > field to a separate patch. One change, one patch. > > > if (ret) { > > dev_err(dev, "Fail to set frame rate lanes reg\n"); > > return ret; > > } > > > > - dev_dbg(dev, "set frame rate: %llu us\n", alvium->fr); > > + dev_dbg(dev, "set frame rate: %llu us\n", fr); > > > > return 0; > > } > > @@ -1667,36 +1663,36 @@ static int alvium_g_frame_interval(struct v4l2_subdev *sd, > > } > > > > static int alvium_set_frame_interval(struct alvium_dev *alvium, > > - struct v4l2_subdev_frame_interval *fi) > > + struct v4l2_subdev *sd, > > + struct v4l2_subdev_state *sd_state, This is also unrelated to this patch. > > + struct v4l2_subdev_frame_interval *fi, > > + u64 *req_fr) > > { > > struct device *dev = &alvium->i2c_client->dev; > > - u64 req_fr, min_fr, max_fr; > > + u64 dft_fr, min_fr, max_fr; > > int ret; > > > > if (fi->interval.denominator == 0) > > return -EINVAL; > > > > - ret = alvium_get_frame_interval(alvium); > > + ret = alvium_get_frame_interval(alvium, &dft_fr, &min_fr, &max_fr); > > if (ret) { > > dev_err(dev, "Fail to get frame interval\n"); > > return ret; > > } > > > > - min_fr = alvium->min_fr; > > - max_fr = alvium->max_fr; > > - > > dev_dbg(dev, "fi->interval.numerator = %d\n", > > fi->interval.numerator); > > dev_dbg(dev, "fi->interval.denominator = %d\n", > > fi->interval.denominator); > > > > - req_fr = (u64)((fi->interval.denominator * USEC_PER_SEC) / > > + *req_fr = (u64)((fi->interval.denominator * USEC_PER_SEC) / > > fi->interval.numerator); > > > > - if (req_fr >= max_fr && req_fr <= min_fr) > > - req_fr = alvium->dft_fr; > > + if (*req_fr >= max_fr && *req_fr <= min_fr) > > + *req_fr = dft_fr; > > > > - alvium->fr = req_fr; > > + alvium->fr = *req_fr; > > alvium->frame_interval.numerator = fi->interval.numerator; > > alvium->frame_interval.denominator = fi->interval.denominator; > > > > @@ -1708,6 +1704,7 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, > > struct v4l2_subdev_frame_interval *fi) > > { > > struct alvium_dev *alvium = sd_to_alvium(sd); > > + u64 req_fr; > > int ret; > > > > /* > > @@ -1720,9 +1717,9 @@ static int alvium_s_frame_interval(struct v4l2_subdev *sd, > > if (alvium->streaming) > > return -EBUSY; > > > > - ret = alvium_set_frame_interval(alvium, fi); > > + ret = alvium_set_frame_interval(alvium, sd, sd_state, fi, &req_fr); > > if (!ret) > > - ret = alvium_set_frame_rate(alvium); > > + ret = alvium_set_frame_rate(alvium, req_fr); > > > > return ret; > > } > > diff --git a/drivers/media/i2c/alvium-csi2.h b/drivers/media/i2c/alvium-csi2.h > > index 8b554bffdc39..a6529b28e7dd 100644 > > --- a/drivers/media/i2c/alvium-csi2.h > > +++ b/drivers/media/i2c/alvium-csi2.h > > @@ -443,9 +443,6 @@ struct alvium_dev { > > > > struct alvium_mode mode; > > struct v4l2_fract frame_interval; > > - u64 dft_fr; > > - u64 min_fr; > > - u64 max_fr; > > u64 fr; > > > > u8 h_sup_csi_lanes;
Hi Tommaso, Thank you for the patch. On Fri, Dec 15, 2023 at 09:24:51AM +0100, Tommaso Merciai wrote: > Inline alvium_s_frame_interval function into alvium_s_frame_interval. I think you mean "alvium_set_frame_interval() function into alvium_s_frame_interval.()" > This to clean the driver code. You can describe the reason more precisely: The alvium_set_frame_interval() is called once only, by alvium_s_frame_interval(). The latter is a thin wrapper around the former. Inline the function in its caller to make the code more readable. The rest looks good to me. > Signed-off-by: Tommaso Merciai <tomm.merciai@gmail.com> > --- > drivers/media/i2c/alvium-csi2.c | 56 ++++++++++++--------------------- > 1 file changed, 20 insertions(+), 36 deletions(-) > > diff --git a/drivers/media/i2c/alvium-csi2.c b/drivers/media/i2c/alvium-csi2.c > index c4b7851045a1..fde456357be1 100644 > --- a/drivers/media/i2c/alvium-csi2.c > +++ b/drivers/media/i2c/alvium-csi2.c > @@ -1662,16 +1662,25 @@ static int alvium_g_frame_interval(struct v4l2_subdev *sd, > return 0; > } > > -static int alvium_set_frame_interval(struct alvium_dev *alvium, > - struct v4l2_subdev *sd, > - struct v4l2_subdev_state *sd_state, > - struct v4l2_subdev_frame_interval *fi, > - u64 *req_fr) > +static int alvium_s_frame_interval(struct v4l2_subdev *sd, > + struct v4l2_subdev_state *sd_state, > + struct v4l2_subdev_frame_interval *fi) > { > + struct alvium_dev *alvium = sd_to_alvium(sd); > struct device *dev = &alvium->i2c_client->dev; > - u64 dft_fr, min_fr, max_fr; > + u64 req_fr, dft_fr, min_fr, max_fr; > int ret; > > + /* > + * FIXME: Implement support for V4L2_SUBDEV_FORMAT_TRY, using the V4L2 > + * subdev active state API. > + */ > + if (fi->which != V4L2_SUBDEV_FORMAT_ACTIVE) > + return -EINVAL; > + > + if (alvium->streaming) > + return -EBUSY; > + > if (fi->interval.denominator == 0) > return -EINVAL; > > @@ -1686,42 +1695,17 @@ static int alvium_set_frame_interval(struct alvium_dev *alvium, > dev_dbg(dev, "fi->interval.denominator = %d\n", > fi->interval.denominator); > > - *req_fr = (u64)((fi->interval.denominator * USEC_PER_SEC) / > + req_fr = (u64)((fi->interval.denominator * USEC_PER_SEC) / > fi->interval.numerator); > > - if (*req_fr >= max_fr && *req_fr <= min_fr) > - *req_fr = dft_fr; > + if (req_fr >= max_fr && req_fr <= min_fr) > + req_fr = dft_fr; > > - alvium->fr = *req_fr; > + alvium->fr = req_fr; > alvium->frame_interval.numerator = fi->interval.numerator; > alvium->frame_interval.denominator = fi->interval.denominator; > > - return 0; > -} > - > -static int alvium_s_frame_interval(struct v4l2_subdev *sd, > - struct v4l2_subdev_state *sd_state, > - struct v4l2_subdev_frame_interval *fi) > -{ > - struct alvium_dev *alvium = sd_to_alvium(sd); > - u64 req_fr; > - int ret; > - > - /* > - * FIXME: Implement support for V4L2_SUBDEV_FORMAT_TRY, using the V4L2 > - * subdev active state API. > - */ > - if (fi->which != V4L2_SUBDEV_FORMAT_ACTIVE) > - return -EINVAL; > - > - if (alvium->streaming) > - return -EBUSY; > - > - ret = alvium_set_frame_interval(alvium, sd, sd_state, fi, &req_fr); > - if (!ret) > - ret = alvium_set_frame_rate(alvium, req_fr); > - > - return ret; > + return alvium_set_frame_rate(alvium, req_fr); > } > > static int alvium_enum_mbus_code(struct v4l2_subdev *sd,