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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C69FC433F5 for ; Thu, 20 Jan 2022 15:13:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376543AbiATPNM (ORCPT ); Thu, 20 Jan 2022 10:13:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:45968 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376529AbiATPNL (ORCPT ); Thu, 20 Jan 2022 10:13:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642691590; 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=Dif+C+Zl6QCjPSy2Dh/zytGlPwVdgsHB7fsGJyn6IXs=; b=djbQcAQFqCGfSUSSCUxlCyksMnsNSfvvBRa50L7xjjHiIjV0Xl1LlVmWhYvff08xu/W+YY TwOBdvlmr+hG6Cqsdm1R5/2V4pwqeg8TH+T5ldWOlTDySW4dqRQIO9LeC577Qx3Zc1FlIe mBB50YFLg7Fe+VsZTjyIzhjUH7PA4q8= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-339-NsB3Et7WPe-JrSZ_gl_yhA-1; Thu, 20 Jan 2022 10:13:08 -0500 X-MC-Unique: NsB3Et7WPe-JrSZ_gl_yhA-1 Received: by mail-ed1-f70.google.com with SMTP id el8-20020a056402360800b00403bbdcef64so6155319edb.14 for ; Thu, 20 Jan 2022 07:13:08 -0800 (PST) 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=Dif+C+Zl6QCjPSy2Dh/zytGlPwVdgsHB7fsGJyn6IXs=; b=tHzdEYpMhTj9NlVOdDbTS1DGfQ1IQiZ/a9ERCQFRQ8eGr662ywjVhJuPBwXscjvXWO 3yimkdapDY1zJ8A+68/wcDrloEwwxqMt1pfvkITNIEaIpUEK9zJZtTjQ0GyyLFo4yLyU jT01a8mYBZNB3Wd+3lfd5gYju9rwarBPKPxajiBCmIAR/bh71sn20Ju5XU0yd/1Kq8uy vxKZq5yonoSNZS44LXimmrgEbJJxhPAJejBalHD/vwxU9UvH5nHNTfYKtfa1MssmqK2Q TsK4ArrqbLXOPRYNR3fnqaEUJW1ymLEr7yUNzjrGG3Jy6iCri/5S7hKacDTo9z7UZD3z L9Rw== X-Gm-Message-State: AOAM531K8D4CuRMO0eSRsYJdsaxAwqhsY5h09i8VtGOn3xr4J9aWimBd MZghvHHUEKcCKC2lDWrbTY6/WGfhtQ59viyp3SeG0b23TCc2iWSsW7kCKxVcFZlNmwLPaC/EOed Z5uiCZgnoslBNdc3jEQ/Ko898 X-Received: by 2002:a17:906:7e10:: with SMTP id e16mr10110224ejr.143.1642691586632; Thu, 20 Jan 2022 07:13:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJxA9MtA8PkrxZUaZhliWBp4mWn1OrnfF9QzPn7Bnf6gLEWy17zIpjFboW+vz49FINJDp1CFLA== X-Received: by 2002:a17:906:7e10:: with SMTP id e16mr10110190ejr.143.1642691586364; Thu, 20 Jan 2022 07:13:06 -0800 (PST) Received: from ?IPV6:2001:1c00:c1e:bf00:1db8:22d3:1bc9:8ca1? (2001-1c00-0c1e-bf00-1db8-22d3-1bc9-8ca1.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:1db8:22d3:1bc9:8ca1]) by smtp.gmail.com with ESMTPSA id g24sm1122075ejx.11.2022.01.20.07.13.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Jan 2022 07:13:05 -0800 (PST) Message-ID: Date: Thu, 20 Jan 2022 16:13:05 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: Re: [PATCH v4 6/9] platform/x86: bus-multi-instantiate: Reorganize I2C functions Content-Language: en-US To: Stefan Binding , Mark Brown , "Rafael J . Wysocki" , Len Brown , Mark Gross , Jaroslav Kysela , Takashi Iwai Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org, patches@opensource.cirrus.com, Lucas Tanure References: <20220120134326.5295-1-sbinding@opensource.cirrus.com> <20220120134326.5295-7-sbinding@opensource.cirrus.com> From: Hans de Goede In-Reply-To: <20220120134326.5295-7-sbinding@opensource.cirrus.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 1/20/22 14:43, Stefan Binding wrote: > From: Lucas Tanure > > Reorganize I2C functions to accommodate SPI support > Split the probe and factor out parts of the code > that will be used in the SPI support > > Signed-off-by: Lucas Tanure > Signed-off-by: Stefan Binding > --- > drivers/platform/x86/bus-multi-instantiate.c | 150 ++++++++++++------- > 1 file changed, 96 insertions(+), 54 deletions(-) > > diff --git a/drivers/platform/x86/bus-multi-instantiate.c b/drivers/platform/x86/bus-multi-instantiate.c > index 982dfecfd27c..50f1540762e9 100644 > --- a/drivers/platform/x86/bus-multi-instantiate.c > +++ b/drivers/platform/x86/bus-multi-instantiate.c > @@ -29,85 +29,129 @@ struct bmi_instance { > > struct bmi { > int i2c_num; > - struct i2c_client *i2c_devs[]; > + struct i2c_client **i2c_devs; > }; > > -static int bmi_probe(struct platform_device *pdev) > +static int bmi_get_irq(struct platform_device *pdev, struct acpi_device *adev, > + const struct bmi_instance *inst) > +{ > + int ret; > + > + switch (inst->flags & IRQ_RESOURCE_TYPE) { > + case IRQ_RESOURCE_GPIO: > + ret = acpi_dev_gpio_irq_get(adev, inst->irq_idx); > + break; > + case IRQ_RESOURCE_APIC: > + ret = platform_get_irq(pdev, inst->irq_idx); > + break; > + default: > + ret = 0; > + break; > + } > + > + if (ret < 0) > + dev_err_probe(&pdev->dev, ret, "Error requesting irq at index %d: %d\n", > + inst->irq_idx, ret); > + > + return ret; > +} > + > +static void bmi_devs_unregister(struct bmi *bmi) > +{ > + while (bmi->i2c_num > 0) > + i2c_unregister_device(bmi->i2c_devs[--bmi->i2c_num]); > +} > + > +/** > + * bmi_i2c_probe - Instantiate multiple I2C devices from inst array > + * @pdev: Platform device > + * @adev: ACPI device > + * @bmi: Internal struct for Bus multi instantiate driver > + * @inst: Array of instances to probe > + * > + * Returns the number of I2C devices instantiate, Zero if none is found or a negative error code. > + */ > +static int bmi_i2c_probe(struct platform_device *pdev, struct acpi_device *adev, struct bmi *bmi, > + const struct bmi_instance *inst_array) > { > struct i2c_board_info board_info = {}; > - const struct bmi_instance *inst; > struct device *dev = &pdev->dev; > - struct acpi_device *adev; > - struct bmi *bmi; > char name[32]; > - int i, ret; > + int i, ret = 0, count; Nitpick no need to init ret to 0 here since you re-assing it immediately afterwards. > > - inst = device_get_match_data(dev); > - if (!inst) { > - dev_err(dev, "Error ACPI match data is missing\n"); > - return -ENODEV; > - } > - > - adev = ACPI_COMPANION(dev); > - > - /* Count number of clients to instantiate */ > ret = i2c_acpi_client_count(adev); > - if (ret < 0) > + if (ret <= 0) > return ret; > + count = ret; > > - bmi = devm_kmalloc(dev, struct_size(bmi, i2c_devs, ret), GFP_KERNEL); > - if (!bmi) > + bmi->i2c_devs = devm_kcalloc(dev, count, sizeof(*bmi->i2c_devs), GFP_KERNEL); > + if (!bmi->i2c_devs) > return -ENOMEM; > > - bmi->i2c_num = ret; > - > - for (i = 0; i < bmi->i2c_num && inst[i].type; i++) { > + for (i = 0; i < count && inst_array[i].type; i++) { > memset(&board_info, 0, sizeof(board_info)); > - strlcpy(board_info.type, inst[i].type, I2C_NAME_SIZE); > - snprintf(name, sizeof(name), "%s-%s.%d", dev_name(dev), inst[i].type, i); > + strscpy(board_info.type, inst_array[i].type, I2C_NAME_SIZE); > + snprintf(name, sizeof(name), "%s-%s.%d", dev_name(dev), inst_array[i].type, i); > board_info.dev_name = name; > - switch (inst[i].flags & IRQ_RESOURCE_TYPE) { > - case IRQ_RESOURCE_GPIO: > - ret = acpi_dev_gpio_irq_get(adev, inst[i].irq_idx); > - if (ret < 0) { > - dev_err(dev, "Error requesting irq at index %d: %d\n", > - inst[i].irq_idx, ret); > - goto error; > - } > - board_info.irq = ret; > - break; > - case IRQ_RESOURCE_APIC: > - ret = platform_get_irq(pdev, inst[i].irq_idx); > - if (ret < 0) { > - dev_dbg(dev, "Error requesting irq at index %d: %d\n", > - inst[i].irq_idx, ret); > - goto error; > - } > - board_info.irq = ret; > - break; > - default: > - board_info.irq = 0; > - break; > - } > + > + ret = bmi_get_irq(pdev, adev, &inst_array[i]); > + if (ret < 0) > + goto error; > + board_info.irq = ret; > + > bmi->i2c_devs[i] = i2c_acpi_new_device(dev, i, &board_info); > if (IS_ERR(bmi->i2c_devs[i])) { > ret = dev_err_probe(dev, PTR_ERR(bmi->i2c_devs[i]), > "Error creating i2c-client, idx %d\n", i); > goto error; > } > + bmi->i2c_num++; > } > - if (i < bmi->i2c_num) { > + if (bmi->i2c_num < count) { > dev_err(dev, "Error finding driver, idx %d\n", i); > ret = -ENODEV; > goto error; > } > > - platform_set_drvdata(pdev, bmi); > - return 0; > + dev_info(dev, "Instantiate %d I2C devices.\n", bmi->i2c_num); > > + return bmi->i2c_num; > error: > - while (--i >= 0) > - i2c_unregister_device(bmi->i2c_devs[i]); > + dev_err_probe(dev, ret, "I2C error %d\n", ret); All the ways to get here already log a better error msg, please drop this. > + bmi_devs_unregister(bmi); > + > + return ret; > +} > + > +static int bmi_probe(struct platform_device *pdev) > +{ > + const struct bmi_instance *inst_array; > + struct device *dev = &pdev->dev; > + struct acpi_device *adev; > + struct bmi *bmi; > + int ret; > + > + inst_array = device_get_match_data(dev); > + if (!inst_array) { > + dev_err(dev, "Error ACPI match data is missing\n"); > + return -ENODEV; > + } > + > + adev = ACPI_COMPANION(dev); > + if (!adev) > + return -ENODEV; > + > + bmi = devm_kzalloc(dev, sizeof(*bmi), GFP_KERNEL); > + if (!bmi) > + return -ENOMEM; > + > + platform_set_drvdata(pdev, bmi); > + > + ret = bmi_i2c_probe(pdev, adev, bmi, inst_array); > + if (ret > 0) > + return 0; > + if (ret == 0) > + ret = -ENODEV; > > return ret; > } > @@ -115,10 +159,8 @@ static int bmi_probe(struct platform_device *pdev) > static int bmi_remove(struct platform_device *pdev) > { > struct bmi *bmi = platform_get_drvdata(pdev); > - int i; > > - for (i = 0; i < bmi->i2c_num; i++) > - i2c_unregister_device(bmi->i2c_devs[i]); > + bmi_devs_unregister(bmi); > > return 0; > } > Otherwise this looks good to me, with my 2 minor remarsk addressed: Reviewed-by: Hans de Goede Regards, Hans