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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 DCE58C433B4 for ; Fri, 7 May 2021 21:26:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A4416613ED for ; Fri, 7 May 2021 21:26:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229747AbhEGV1V (ORCPT ); Fri, 7 May 2021 17:27:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229470AbhEGV1S (ORCPT ); Fri, 7 May 2021 17:27:18 -0400 Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5F1DC061574 for ; Fri, 7 May 2021 14:26:16 -0700 (PDT) Received: by mail-io1-xd35.google.com with SMTP id z24so9282970ioi.3 for ; Fri, 07 May 2021 14:26:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=STKiO9AWpCH39xgVyEDHDKCth0FNOrDqcymI0L9meSo=; b=WARh69Kczqdp+LQIYesVKz6ExULo6eoSYeI7iIW/Q+OO6F+Zl5OkQNgdNgi3Jt4I8W c44rh4RqJQSf3jvfLzNFUDGlTH2SVWAWW5ahnXhhWlUCBacsApAEp8p+PvhlxjwEHKuU Gxgcpb8oh5wu5pVWwQi3ILcI5ZRmabNvZkT/M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=STKiO9AWpCH39xgVyEDHDKCth0FNOrDqcymI0L9meSo=; b=fM+NRQVbUlq3KwOAT3gOPT1Uzrgbp6Xl07bzIhxOQTDqJOjqSCUjLcpoVWaDOmEoHD MPjp7jr0G4dUKl07HjNKSE86bAOGXHqOCoJ9fftWikTBtfcT0t3nAWonaxc4POML1WaE nbT9VasibudPkG7Tz0Hi0d1KJ8bQ9RuKtNQIMM62Tm3s8baw/u+HPIzbfq4SD+xQVMPA Simotmy/uo1fUxejD8RuH0hoX6+K7ej46ALjA/PKx08xLN68unQHqjIEovWgAn5T+qYx ikXLJJCtBzemIXyZ9+RTfogMLWwruwjCJLYxZL4bS5cUYFsbsNaQpaxVxc4yVBXXeyod j/bw== X-Gm-Message-State: AOAM532/nmVEfyZao5VPL6NiMvW5HEw8vZ77r91ituw28oSWMZW3MdLS nWc97F1XYRxBukhgxFskvApUZCjOY4mQPEtV57uzUg== X-Google-Smtp-Source: ABdhPJxEvAGnj2AJE+vvIJ2GGQoEcb6+aGVGE/J72s4ZVmpvaQAUKg/kHn3pW4/LwiH8dI51b1se5InfpZo3BeRnJ8s= X-Received: by 2002:a6b:cdc6:: with SMTP id d189mr8797891iog.46.1620422776360; Fri, 07 May 2021 14:26:16 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Matt Ranostay Date: Fri, 7 May 2021 14:26:05 -0700 Message-ID: Subject: Re: [PATCH v5 29/30] media: i2c: video-i2c: use pm_runtime_resume_and_get() To: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , open list , linux-media Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, May 6, 2021 at 8:23 AM Mauro Carvalho Chehab wrote: > > Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") > added pm_runtime_resume_and_get() in order to automatically handle > dev->power.usage_count decrement on errors. > > Use the new API, in order to cleanup the error check logic. > Acked-by: Matt Ranostay > Signed-off-by: Mauro Carvalho Chehab > --- > drivers/media/i2c/video-i2c.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c > index 0465832a4090..de12f38f347c 100644 > --- a/drivers/media/i2c/video-i2c.c > +++ b/drivers/media/i2c/video-i2c.c > @@ -286,11 +286,9 @@ static int amg88xx_read(struct device *dev, enum hwmon_sensor_types type, > __le16 buf; > int tmp; > > - tmp = pm_runtime_get_sync(regmap_get_device(data->regmap)); > - if (tmp < 0) { > - pm_runtime_put_noidle(regmap_get_device(data->regmap)); > + tmp = pm_runtime_resume_and_get(regmap_get_device(data->regmap)); > + if (tmp < 0) > return tmp; > - } > > tmp = regmap_bulk_read(data->regmap, AMG88XX_REG_TTHL, &buf, 2); > pm_runtime_mark_last_busy(regmap_get_device(data->regmap)); > @@ -512,11 +510,9 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count) > if (data->kthread_vid_cap) > return 0; > > - ret = pm_runtime_get_sync(dev); > - if (ret < 0) { > - pm_runtime_put_noidle(dev); > + ret = pm_runtime_resume_and_get(dev); > + if (ret < 0) > goto error_del_list; > - } > > ret = data->chip->setup(data); > if (ret) > -- > 2.30.2 >