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 2779DC433FE for ; Mon, 1 Nov 2021 10:48:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0FFCC60FE8 for ; Mon, 1 Nov 2021 10:48:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232131AbhKAKvG (ORCPT ); Mon, 1 Nov 2021 06:51:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59844 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232017AbhKAKvF (ORCPT ); Mon, 1 Nov 2021 06:51:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635763711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Z2r4wjgjmfKtWXXm/PRt+JSau+E3wOrLAYY5e+orSU=; b=HNj/xOdMYfCbTVzOJAARTd9HeHA/L5KYBooA9B2uOEC1pGE7/kbPlS36jgHzl0Kosb87m9 /EHwulFDr3r0EFzK/hGRVIZSUVemdD8tt85pxF7mIWyLmmod82zK3P3kQZS8AwPtS6JJif gZQr2SVkQFmrGYFyME13cL9jK0udFb0= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-429-CwVtLIbfOoOXnCCGelgJ_A-1; Mon, 01 Nov 2021 06:48:30 -0400 X-MC-Unique: CwVtLIbfOoOXnCCGelgJ_A-1 Received: by mail-ed1-f69.google.com with SMTP id u10-20020a50d94a000000b003dc51565894so15128879edj.21 for ; Mon, 01 Nov 2021 03:48:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=/Z2r4wjgjmfKtWXXm/PRt+JSau+E3wOrLAYY5e+orSU=; b=52gOhBgyaCq7c0BFmQYb8bMW3CIZRJO3o7c+nOH7KND+Z+dB+MCzx2jSYt++pmstRt f8IbvtlQYomim+UzO575cdEZZu/PffKAN5irt99tDKDdRHT7Lb1XMTp7O66+pK2SKtAN y9gdr/f5Nj642c4oiO1PHLu1B302DYYcWuq6GtvZeepeNc/mWjLJY/V2XRi2FIK9J/CV lIScnE2uYJJgX1MHtBvY1llzhP/FfS1rc4mqw9X6V+jbgPFceo8oXkvVjWfndd6HyuwB U7bOFga68cFuJ37do9nspymlxIj1BVS3DSdO4jPAGD9RkU00XMGWC7wa++nFeCHngd7o UrmA== X-Gm-Message-State: AOAM530X7uiCcePcob8mRuloiMCWh2vjFScvJaVRlfynNAmMtjWC578z hwAU3y5np9j7aEVZCKqm1eD2opIfiXZoS8N2Ispej3QNFr2AlBKfU0iMV8kRVVQ7WF0aG+JRiuO ZMD1BJmYIKaWG24/b7+9oIUlAemrto8FA7Q== X-Received: by 2002:a05:6402:331:: with SMTP id q17mr3272966edw.58.1635763709666; Mon, 01 Nov 2021 03:48:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqwZ6pYKJ964qOQyIfK0fQV7DN0AlpOGjSg/1ST/kyNYa/fXNYu4eGpY0jOgRgPJc3qHFynA== X-Received: by 2002:a05:6402:331:: with SMTP id q17mr3272945edw.58.1635763709553; Mon, 01 Nov 2021 03:48:29 -0700 (PDT) Received: from [10.40.1.223] ([81.30.35.201]) by smtp.gmail.com with ESMTPSA id hp3sm7010914ejc.61.2021.11.01.03.48.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 01 Nov 2021 03:48:29 -0700 (PDT) Message-ID: <9ccd15b1-f751-5c05-cca0-bfccbb9d5b1f@redhat.com> Date: Mon, 1 Nov 2021 11:48:28 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: [PATCH v4 08/11] platform/x86: int3472: Add get_sensor_adev_and_name() helper Content-Language: en-US To: Andy Shevchenko 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 References: <20211025094119.82967-1-hdegoede@redhat.com> <20211025094119.82967-9-hdegoede@redhat.com> <8804fa29-d0d9-14a9-e48e-268113a79d07@redhat.com> From: Hans de Goede In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Hi, On 11/1/21 11:44, Andy Shevchenko wrote: > 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(...); Then we have 2 acpi_dev_put() paths, IMHO the original code which clearly states that we keep the ref: if (success && returning-the-ref) and put the ref in all other cases is better then having 2 separate put paths. Regards, Hans