From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_NEOMUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 133D7C43387 for ; Mon, 7 Jan 2019 14:10:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E1E3B206C0 for ; Mon, 7 Jan 2019 14:10:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728772AbfAGOKL (ORCPT ); Mon, 7 Jan 2019 09:10:11 -0500 Received: from mga12.intel.com ([192.55.52.136]:27230 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728364AbfAGOKK (ORCPT ); Mon, 7 Jan 2019 09:10:10 -0500 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jan 2019 06:10:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,451,1539673200"; d="scan'208";a="308187285" Received: from bachmicx-mobl.ger.corp.intel.com (HELO kekkonen.fi.intel.com) ([10.252.57.24]) by fmsmga006.fm.intel.com with ESMTP; 07 Jan 2019 06:10:08 -0800 Received: by kekkonen.fi.intel.com (Postfix, from userid 1000) id 08D2B21D0B; Mon, 7 Jan 2019 16:10:03 +0200 (EET) Date: Mon, 7 Jan 2019 16:10:03 +0200 From: Sakari Ailus To: Akinobu Mita Cc: linux-media@vger.kernel.org, "open list:OPEN FIRMWARE AND..." , Guennadi Liakhovetski , Mauro Carvalho Chehab Subject: Re: [PATCH 06/12] media: mt9m001: switch s_power callback to runtime PM Message-ID: <20190107141003.li4x37co2s4jk5xm@kekkonen.localdomain> References: <1545498774-11754-1-git-send-email-akinobu.mita@gmail.com> <1545498774-11754-7-git-send-email-akinobu.mita@gmail.com> <20190107100034.po3jsnc3rdj37l4x@kekkonen.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Mita-san, On Mon, Jan 07, 2019 at 11:07:18PM +0900, Akinobu Mita wrote: > 2019年1月7日(月) 19:00 Sakari Ailus : > > > > Hi Mita-san, > > > > Thanks for the patchset. > > > > On Sun, Dec 23, 2018 at 02:12:48AM +0900, Akinobu Mita wrote: > > > Switch s_power() callback to runtime PM framework. This also removes > > > soc_camera specific power management code and introduces reset and standby > > > gpios instead. > > > > > > Cc: Guennadi Liakhovetski > > > Cc: Sakari Ailus > > > Cc: Mauro Carvalho Chehab > > > Signed-off-by: Akinobu Mita > > > --- > > > drivers/media/i2c/mt9m001.c | 242 ++++++++++++++++++++++++++++++++------------ > > > 1 file changed, 178 insertions(+), 64 deletions(-) > > > > > > diff --git a/drivers/media/i2c/mt9m001.c b/drivers/media/i2c/mt9m001.c > > > index c0180fdc..f20188a 100644 > > > --- a/drivers/media/i2c/mt9m001.c > > > +++ b/drivers/media/i2c/mt9m001.c > > > @@ -5,6 +5,10 @@ > > > * Copyright (C) 2008, Guennadi Liakhovetski > > > */ > > > > > > +#include > > > +#include > > > +#include > > > +#include > > > #include > > > #include > > > #include > > > @@ -13,7 +17,6 @@ > > > > > > #include > > > #include > > > -#include > > > #include > > > #include > > > > > > @@ -92,8 +95,12 @@ struct mt9m001 { > > > struct v4l2_ctrl *autoexposure; > > > struct v4l2_ctrl *exposure; > > > }; > > > + bool streaming; > > > + struct mutex mutex; > > > struct v4l2_rect rect; /* Sensor window */ > > > - struct v4l2_clk *clk; > > > + struct clk *clk; > > > + struct gpio_desc *standby_gpio; > > > + struct gpio_desc *reset_gpio; > > > const struct mt9m001_datafmt *fmt; > > > const struct mt9m001_datafmt *fmts; > > > int num_fmts; > > > @@ -177,8 +184,7 @@ static int mt9m001_init(struct i2c_client *client) > > > return multi_reg_write(client, init_regs, ARRAY_SIZE(init_regs)); > > > } > > > > > > -static int mt9m001_apply_selection(struct v4l2_subdev *sd, > > > - struct v4l2_rect *rect) > > > +static int mt9m001_apply_selection(struct v4l2_subdev *sd) > > > { > > > struct i2c_client *client = v4l2_get_subdevdata(sd); > > > struct mt9m001 *mt9m001 = to_mt9m001(client); > > > @@ -190,11 +196,11 @@ static int mt9m001_apply_selection(struct v4l2_subdev *sd, > > > * The caller provides a supported format, as verified per > > > * call to .set_fmt(FORMAT_TRY). > > > */ > > > - { MT9M001_COLUMN_START, rect->left }, > > > - { MT9M001_ROW_START, rect->top }, > > > - { MT9M001_WINDOW_WIDTH, rect->width - 1 }, > > > + { MT9M001_COLUMN_START, mt9m001->rect.left }, > > > + { MT9M001_ROW_START, mt9m001->rect.top }, > > > + { MT9M001_WINDOW_WIDTH, mt9m001->rect.width - 1 }, > > > { MT9M001_WINDOW_HEIGHT, > > > - rect->height + mt9m001->y_skip_top - 1 }, > > > + mt9m001->rect.height + mt9m001->y_skip_top - 1 }, > > > }; > > > > > > return multi_reg_write(client, regs, ARRAY_SIZE(regs)); > > > @@ -203,11 +209,50 @@ static int mt9m001_apply_selection(struct v4l2_subdev *sd, > > > static int mt9m001_s_stream(struct v4l2_subdev *sd, int enable) > > > { > > > struct i2c_client *client = v4l2_get_subdevdata(sd); > > > + struct mt9m001 *mt9m001 = to_mt9m001(client); > > > + int ret = 0; > > > > > > - /* Switch to master "normal" mode or stop sensor readout */ > > > - if (reg_write(client, MT9M001_OUTPUT_CONTROL, enable ? 2 : 0) < 0) > > > - return -EIO; > > > - return 0; > > > + mutex_lock(&mt9m001->mutex); > > > + > > > + if (mt9m001->streaming == enable) > > > + goto done; > > > + > > > + if (enable) { > > > + ret = pm_runtime_get_sync(&client->dev); > > > + if (ret < 0) { > > > + pm_runtime_put_noidle(&client->dev); > > > + goto done; > > > > How about adding another label for calling pm_runtime_put()? The error > > handling is the same in all cases. You can also use pm_runtime_put() > > instead of pm_runtime_put_noidle() here; there's no harm done. > > There are two ways that I can think of. Which one do you prefer? > > (1) > done: > mutex_unlock(&mt9m001->mutex); > > return 0; > > enable_error: > pm_runtime_put(&client->dev); > mutex_unlock(&mt9m001->mutex); > > return ret; > } > > (2) > done: > if (ret && enable) > pm_runtime_put(&client->dev); > > mutex_unlock(&mt9m001->mutex); > > return ret; > } I'd prefer the first; it's cleaner. I might call the new label e.g. put_unlock as that describes what it does. -- Sakari Ailus sakari.ailus@linux.intel.com