From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> To: Lee Jones <lee.jones@linaro.org>, Rob Herring <robh+dt@kernel.org>, Benson Leung <bleung@chromium.org>, Guenter Roeck <groeck@chromium.org>, Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>, Andi Shyti <andi@etezian.org>, Mark Brown <broonie@kernel.org>, Balletbo i Serra <enric.balletbo@collabora.com>, Sam Protsenko <semen.protsenko@linaro.org>, Pratyush Yadav <p.yadav@ti.com>, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-spi@vger.kernel.org Cc: Alim Akhtar <alim.akhtar@samsung.com>, Rob Herring <robh@kernel.org> Subject: [PATCH v4 5/5] spi: s3c64xx: allow controller-data to be optional Date: Wed, 19 Jan 2022 21:10:05 +0100 [thread overview] Message-ID: <20220119201005.13145-6-krzysztof.kozlowski@canonical.com> (raw) In-Reply-To: <20220119201005.13145-1-krzysztof.kozlowski@canonical.com> The Samsung SoC SPI driver requires to provide controller-data node for each of SPI peripheral device nodes. Make this controller-data node optional, so DTS could be simpler. Suggested-by: Rob Herring <robh@kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org> --- drivers/spi/spi-s3c64xx.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 8755cd85e83c..769d958a2f86 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -796,16 +796,14 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata( return ERR_PTR(-EINVAL); } - data_np = of_get_child_by_name(slave_np, "controller-data"); - if (!data_np) { - dev_err(&spi->dev, "child node 'controller-data' not found\n"); - return ERR_PTR(-EINVAL); - } - cs = kzalloc(sizeof(*cs), GFP_KERNEL); - if (!cs) { - of_node_put(data_np); + if (!cs) return ERR_PTR(-ENOMEM); + + data_np = of_get_child_by_name(slave_np, "controller-data"); + if (!data_np) { + dev_info(&spi->dev, "child node 'controller-data' not found, using defaults\n"); + return cs; } of_property_read_u32(data_np, "samsung,spi-feedback-delay", &fb_delay); -- 2.32.0
WARNING: multiple messages have this Message-ID (diff)
From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> To: Lee Jones <lee.jones@linaro.org>, Rob Herring <robh+dt@kernel.org>, Benson Leung <bleung@chromium.org>, Guenter Roeck <groeck@chromium.org>, Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>, Andi Shyti <andi@etezian.org>, Mark Brown <broonie@kernel.org>, Balletbo i Serra <enric.balletbo@collabora.com>, Sam Protsenko <semen.protsenko@linaro.org>, Pratyush Yadav <p.yadav@ti.com>, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-spi@vger.kernel.org Cc: Alim Akhtar <alim.akhtar@samsung.com>, Rob Herring <robh@kernel.org> Subject: [PATCH v4 5/5] spi: s3c64xx: allow controller-data to be optional Date: Wed, 19 Jan 2022 21:10:05 +0100 [thread overview] Message-ID: <20220119201005.13145-6-krzysztof.kozlowski@canonical.com> (raw) In-Reply-To: <20220119201005.13145-1-krzysztof.kozlowski@canonical.com> The Samsung SoC SPI driver requires to provide controller-data node for each of SPI peripheral device nodes. Make this controller-data node optional, so DTS could be simpler. Suggested-by: Rob Herring <robh@kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org> --- drivers/spi/spi-s3c64xx.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 8755cd85e83c..769d958a2f86 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -796,16 +796,14 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata( return ERR_PTR(-EINVAL); } - data_np = of_get_child_by_name(slave_np, "controller-data"); - if (!data_np) { - dev_err(&spi->dev, "child node 'controller-data' not found\n"); - return ERR_PTR(-EINVAL); - } - cs = kzalloc(sizeof(*cs), GFP_KERNEL); - if (!cs) { - of_node_put(data_np); + if (!cs) return ERR_PTR(-ENOMEM); + + data_np = of_get_child_by_name(slave_np, "controller-data"); + if (!data_np) { + dev_info(&spi->dev, "child node 'controller-data' not found, using defaults\n"); + return cs; } of_property_read_u32(data_np, "samsung,spi-feedback-delay", &fb_delay); -- 2.32.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-01-19 20:10 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-19 20:10 [PATCH v4 0/5] spi: dt-bindings: samsung: convert to dtschema Krzysztof Kozlowski 2022-01-19 20:10 ` Krzysztof Kozlowski 2022-01-19 20:10 ` [PATCH v4 1/5] ARM: dts: exynos: split dmas into array of phandles in Exynos5250 Krzysztof Kozlowski 2022-01-19 20:10 ` Krzysztof Kozlowski 2022-01-19 20:10 ` [PATCH v4 2/5] spi: dt-bindings: samsung: convert to dtschema Krzysztof Kozlowski 2022-01-19 20:10 ` Krzysztof Kozlowski 2022-01-19 20:10 ` [PATCH v4 3/5] spi: dt-bindings: samsung: allow controller-data to be optional Krzysztof Kozlowski 2022-01-19 20:10 ` Krzysztof Kozlowski 2022-01-19 20:10 ` [PATCH v4 4/5] mfd: dt-bindings: google,cros-ec: reference Samsung SPI bindings Krzysztof Kozlowski 2022-01-19 20:10 ` [PATCH v4 4/5] mfd: dt-bindings: google, cros-ec: " Krzysztof Kozlowski 2022-01-19 20:10 ` Krzysztof Kozlowski [this message] 2022-01-19 20:10 ` [PATCH v4 5/5] spi: s3c64xx: allow controller-data to be optional Krzysztof Kozlowski 2022-01-19 20:55 ` Andi Shyti 2022-01-19 20:55 ` Andi Shyti 2022-01-20 7:38 ` Krzysztof Kozlowski 2022-01-20 7:38 ` Krzysztof Kozlowski
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220119201005.13145-6-krzysztof.kozlowski@canonical.com \ --to=krzysztof.kozlowski@canonical.com \ --cc=alim.akhtar@samsung.com \ --cc=andi@etezian.org \ --cc=bleung@chromium.org \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=enric.balletbo@collabora.com \ --cc=groeck@chromium.org \ --cc=lee.jones@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=linux-spi@vger.kernel.org \ --cc=p.yadav@ti.com \ --cc=robh+dt@kernel.org \ --cc=robh@kernel.org \ --cc=semen.protsenko@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.