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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31C4DC43217 for ; Mon, 1 Nov 2021 10:45:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 28D1E610CA for ; Mon, 1 Nov 2021 10:45:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232075AbhKAKsP (ORCPT ); Mon, 1 Nov 2021 06:48:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231485AbhKAKsO (ORCPT ); Mon, 1 Nov 2021 06:48:14 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CEA0C061714; Mon, 1 Nov 2021 03:45:41 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id m14so9928815edd.0; Mon, 01 Nov 2021 03:45:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=YrYn8HwkWu9IjsAY6uUUxMRIsoewZD3Zbqzhh/3VGa4=; b=gcQ/W/pfScTsVlIdnaYRMAJfaCGT5vIoV/HBDj3pBRvGqLyB77tm9U6uQTjzvi5CDh kDcbsYKeN1DOtJVn0yLMEEpD5t0Fn3Q+Vim709sGzTfh94eCQ9QI9D7G0A3J9wYXH2L4 ctKEc1sFdbJ+xK9jqFqyGFSRTd7ASax35cAhTEK0/xcY7v5TCenjNMz9dqfwpBuenqRM viBH7V9FdsMuNcHYvnQw28DLA3n4f1wS0p07BvtfdNJHBFuBzOisXnQPIlXcEMLPTcCy lTp4CcQ3U53ajAospJ3Q1pTt+jeK/y7DtOjf+2DRnx1srVnRFLzxle/PbKv0a2sjTs84 Kqew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=YrYn8HwkWu9IjsAY6uUUxMRIsoewZD3Zbqzhh/3VGa4=; b=extyXQ4JMyfnIWj25l9gIBEc5F/W1UC8p2V/0SG0IUnybwwao+SYwz+uyk9xVGIelK HV62KO939/RneV5oqDrvLGwhQSHLRsnmSO9fV5TnE/zSYN6COiRg0mRZ39iISh2Q4cWx TXJE0Q4eyUkFOhbUcZOTdGPdkeXsTEjLlNyFGyERaZVe8G4LJofaNx0NbpDrf9I/c5Cm rSfs8u3SVHAydrtksEJLFWMXvlb9jV0fHWUE2QhfmxeHPN92c8K/43ERWjhcm/KFUtfU NKRUXD62fJcvCU7Po6VWsAE34eTXWyLUsDXd11u2BSAP1cbcQa2pLGjaH9uYOOcfrApR dRSA== X-Gm-Message-State: AOAM533AlKrlUtYJ0/VsH0Q/1tLv/X4u+4JiScra+Nq5azoUK5pbIpvN fDiKDkZ3BmsGT3n9zyu4+9n9Qpy10/yePEPru5U= X-Google-Smtp-Source: ABdhPJwlk7yj+LnqpGtUa24O/09WH38yisRxJGg+DakfxGjwjisBLvrxXASwHyz72wFB/a950EFjZKDxi1ATHq9GK8k= X-Received: by 2002:a17:906:2887:: with SMTP id o7mr34660453ejd.425.1635763539634; Mon, 01 Nov 2021 03:45:39 -0700 (PDT) MIME-Version: 1.0 References: <20211025094119.82967-1-hdegoede@redhat.com> <20211025094119.82967-9-hdegoede@redhat.com> <8804fa29-d0d9-14a9-e48e-268113a79d07@redhat.com> In-Reply-To: <8804fa29-d0d9-14a9-e48e-268113a79d07@redhat.com> From: Andy Shevchenko Date: Mon, 1 Nov 2021 12:44:49 +0200 Message-ID: Subject: Re: [PATCH v4 08/11] platform/x86: int3472: Add get_sensor_adev_and_name() helper To: Hans de Goede Cc: "Rafael J . Wysocki" , Mark Gross , Andy Shevchenko , Wolfram Sang , Mika Westerberg , Daniel Scally , Laurent Pinchart , Mauro Carvalho Chehab , Liam Girdwood , Mark Brown , Michael Turquette , Stephen Boyd , Len Brown , ACPI Devel Maling List , Platform Driver , Linux Kernel Mailing List , linux-i2c , Sakari Ailus , Kate Hsuan , Linux Media Mailing List , linux-clk Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org On Mon, Nov 1, 2021 at 12:31 PM Hans de Goede wrote: > On 10/25/21 13:31, Andy Shevchenko wrote: > > On Mon, Oct 25, 2021 at 12:42 PM Hans de Goede wrote: ... > >> +int skl_int3472_get_sensor_adev_and_name(struct device *dev, > >> + struct acpi_device **sensor_adev_ret, > >> + const char **name_ret) > >> +{ > >> + struct acpi_device *adev = ACPI_COMPANION(dev); > >> + struct acpi_device *sensor; > >> + int ret = 0; > >> + > >> + sensor = acpi_dev_get_first_consumer_dev(adev); > >> + if (!sensor) { > >> + dev_err(dev, "INT3472 seems to have no dependents.\n"); > >> + return -ENODEV; > >> + } > >> + > >> + *name_ret = devm_kasprintf(dev, GFP_KERNEL, I2C_DEV_NAME_FORMAT, > >> + acpi_dev_name(sensor)); > >> + if (!*name_ret) > >> + ret = -ENOMEM; > >> + > >> + if (ret == 0 && sensor_adev_ret) > >> + *sensor_adev_ret = sensor; > >> + else > >> + acpi_dev_put(sensor); > >> + > >> + return ret; > > > > The error path is twisted a bit including far staying ret=0 assignment. > > > > Can it be > > > > int ret; > > ... > > *name_ret = devm_kasprintf(dev, GFP_KERNEL, I2C_DEV_NAME_FORMAT, > > acpi_dev_name(sensor)); > > if (!*name_ret) { > > acpi_dev_put(sensor); > > return -ENOMEM; > > } > > > > if (sensor_adev_ret) > > *sensor_adev_ret = sensor; > > > > return 0; > > > > ? > > That misses an acpi_dev_put(sensor) when sensor_adev_ret == NULL. else acpi_dev_put(...); ? -- With Best Regards, Andy Shevchenko