From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, "Rafael J. Wysocki" <rafael@kernel.org> Cc: Stuart Yoder <stuyoder@gmail.com>, "K. Y. Srinivasan" <kys@microsoft.com>, Haiyang Zhang <haiyangz@microsoft.com>, Stephen Hemminger <sthemmin@microsoft.com>, Wei Liu <wei.liu@kernel.org>, Dexuan Cui <decui@microsoft.com>, Bjorn Helgaas <bhelgaas@google.com>, Bjorn Andersson <bjorn.andersson@linaro.org>, Mathieu Poirier <mathieu.poirier@linaro.org>, Vineeth Vijayan <vneethv@linux.ibm.com>, Peter Oberparleiter <oberpar@linux.ibm.com>, Heiko Carstens <hca@linux.ibm.com>, Vasily Gorbik <gor@linux.ibm.com>, Alexander Gordeev <agordeev@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Sven Schnelle <svens@linux.ibm.com>, Andy Gross <agross@kernel.org>, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, NXP Linux Team <linux-imx@nxp.com>, linux-arm-kernel@lists.infradead.org, linux-hyperv@vger.kernel.org, linux-pci@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-s390@vger.kernel.org, linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, virtualization@lists.linux-foundation.org, Linus Torvalds <torvalds@linux-foundation.org>, Rasmus Villemoes <linux@rasmusvillemoes.dk>, Andy Shevchenko <andy.shevchenko@gmail.com>, Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Subject: [PATCH v6 02/12] amba: Use driver_set_override() instead of open-coding Date: Sun, 3 Apr 2022 20:37:48 +0200 [thread overview] Message-ID: <20220403183758.192236-3-krzysztof.kozlowski@linaro.org> (raw) In-Reply-To: <20220403183758.192236-1-krzysztof.kozlowski@linaro.org> Use a helper to set driver_override to reduce the amount of duplicated code. Make the driver_override field const char, because it is not modified by the core and it matches other subsystems. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- drivers/amba/bus.c | 28 ++++------------------------ include/linux/amba/bus.h | 6 +++++- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index d3bd14aaabf6..f3d26d698b77 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -94,31 +94,11 @@ static ssize_t driver_override_store(struct device *_dev, const char *buf, size_t count) { struct amba_device *dev = to_amba_device(_dev); - char *driver_override, *old, *cp; - - /* We need to keep extra room for a newline */ - if (count >= (PAGE_SIZE - 1)) - return -EINVAL; - - driver_override = kstrndup(buf, count, GFP_KERNEL); - if (!driver_override) - return -ENOMEM; - - cp = strchr(driver_override, '\n'); - if (cp) - *cp = '\0'; - - device_lock(_dev); - old = dev->driver_override; - if (strlen(driver_override)) { - dev->driver_override = driver_override; - } else { - kfree(driver_override); - dev->driver_override = NULL; - } - device_unlock(_dev); + int ret; - kfree(old); + ret = driver_set_override(_dev, &dev->driver_override, buf, count); + if (ret) + return ret; return count; } diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h index 6562f543c3e0..93799a72ff82 100644 --- a/include/linux/amba/bus.h +++ b/include/linux/amba/bus.h @@ -70,7 +70,11 @@ struct amba_device { unsigned int cid; struct amba_cs_uci_id uci; unsigned int irq[AMBA_NR_IRQS]; - char *driver_override; + /* + * Driver name to force a match. Do not set directly, because core + * frees it. Use driver_set_override() to set or clear it. + */ + const char *driver_override; }; struct amba_driver { -- 2.32.0
WARNING: multiple messages have this Message-ID (diff)
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, "Rafael J. Wysocki" <rafael@kernel.org> Cc: Stuart Yoder <stuyoder@gmail.com>, "K. Y. Srinivasan" <kys@microsoft.com>, Haiyang Zhang <haiyangz@microsoft.com>, Stephen Hemminger <sthemmin@microsoft.com>, Wei Liu <wei.liu@kernel.org>, Dexuan Cui <decui@microsoft.com>, Bjorn Helgaas <bhelgaas@google.com>, Bjorn Andersson <bjorn.andersson@linaro.org>, Mathieu Poirier <mathieu.poirier@linaro.org>, Vineeth Vijayan <vneethv@linux.ibm.com>, Peter Oberparleiter <oberpar@linux.ibm.com>, Heiko Carstens <hca@linux.ibm.com>, Vasily Gorbik <gor@linux.ibm.com>, Alexander Gordeev <agordeev@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Sven Schnelle <svens@linux.ibm.com>, Andy Gross <agross@kernel.org>, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, NXP Linux Team <linux-imx@nxp.com>, linux-arm-kernel@lists.infradead.org, linux-hyperv@vger.kernel.org, linux-pci@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-s390@vger.kernel.org, linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, linux-spi@vger.kernel.org, virtualization@lists.linux-foundation.org, Linus Torvalds <torvalds@linux-foundation.org>, Rasmus Villemoes <linux@rasmusvillemoes.dk>, Andy Shevchenko <andy.shevchenko@gmail.com>, Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Subject: [PATCH v6 02/12] amba: Use driver_set_override() instead of open-coding Date: Sun, 3 Apr 2022 20:37:48 +0200 [thread overview] Message-ID: <20220403183758.192236-3-krzysztof.kozlowski@linaro.org> (raw) In-Reply-To: <20220403183758.192236-1-krzysztof.kozlowski@linaro.org> Use a helper to set driver_override to reduce the amount of duplicated code. Make the driver_override field const char, because it is not modified by the core and it matches other subsystems. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- drivers/amba/bus.c | 28 ++++------------------------ include/linux/amba/bus.h | 6 +++++- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index d3bd14aaabf6..f3d26d698b77 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -94,31 +94,11 @@ static ssize_t driver_override_store(struct device *_dev, const char *buf, size_t count) { struct amba_device *dev = to_amba_device(_dev); - char *driver_override, *old, *cp; - - /* We need to keep extra room for a newline */ - if (count >= (PAGE_SIZE - 1)) - return -EINVAL; - - driver_override = kstrndup(buf, count, GFP_KERNEL); - if (!driver_override) - return -ENOMEM; - - cp = strchr(driver_override, '\n'); - if (cp) - *cp = '\0'; - - device_lock(_dev); - old = dev->driver_override; - if (strlen(driver_override)) { - dev->driver_override = driver_override; - } else { - kfree(driver_override); - dev->driver_override = NULL; - } - device_unlock(_dev); + int ret; - kfree(old); + ret = driver_set_override(_dev, &dev->driver_override, buf, count); + if (ret) + return ret; return count; } diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h index 6562f543c3e0..93799a72ff82 100644 --- a/include/linux/amba/bus.h +++ b/include/linux/amba/bus.h @@ -70,7 +70,11 @@ struct amba_device { unsigned int cid; struct amba_cs_uci_id uci; unsigned int irq[AMBA_NR_IRQS]; - char *driver_override; + /* + * Driver name to force a match. Do not set directly, because core + * frees it. Use driver_set_override() to set or clear it. + */ + const char *driver_override; }; struct amba_driver { -- 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-04-03 18:38 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-03 18:37 [PATCH v6 00/12] Fix broken usage of driver_override (and kfree of static memory) Krzysztof Kozlowski 2022-04-03 18:37 ` Krzysztof Kozlowski 2022-04-03 18:37 ` [PATCH v6 01/12] driver: platform: Add helper for safer setting of driver_override Krzysztof Kozlowski 2022-04-03 18:37 ` Krzysztof Kozlowski 2022-04-04 9:16 ` Andy Shevchenko 2022-04-04 9:16 ` Andy Shevchenko 2022-04-04 9:16 ` Andy Shevchenko 2022-04-04 9:16 ` Andy Shevchenko 2022-04-04 9:34 ` Krzysztof Kozlowski 2022-04-04 9:34 ` Krzysztof Kozlowski 2022-04-04 9:34 ` Krzysztof Kozlowski 2022-04-04 10:14 ` Andy Shevchenko 2022-04-04 10:14 ` Andy Shevchenko 2022-04-04 10:14 ` Andy Shevchenko 2022-04-04 10:14 ` Andy Shevchenko 2022-04-03 18:37 ` Krzysztof Kozlowski [this message] 2022-04-03 18:37 ` [PATCH v6 02/12] amba: Use driver_set_override() instead of open-coding Krzysztof Kozlowski 2022-04-03 18:37 ` [PATCH v6 03/12] fsl-mc: " Krzysztof Kozlowski 2022-04-03 18:37 ` Krzysztof Kozlowski 2022-04-03 18:37 ` [PATCH v6 04/12] hv: " Krzysztof Kozlowski 2022-04-03 18:37 ` Krzysztof Kozlowski 2022-04-03 18:37 ` [PATCH v6 05/12] PCI: " Krzysztof Kozlowski 2022-04-03 18:37 ` Krzysztof Kozlowski 2022-04-03 18:37 ` [PATCH v6 06/12] s390/cio: " Krzysztof Kozlowski 2022-04-03 18:37 ` Krzysztof Kozlowski 2022-04-03 18:37 ` [PATCH v6 07/12] spi: Use helper for safer setting of driver_override Krzysztof Kozlowski 2022-04-03 18:37 ` Krzysztof Kozlowski 2022-04-03 18:37 ` [PATCH v6 08/12] vdpa: " Krzysztof Kozlowski 2022-04-03 18:37 ` Krzysztof Kozlowski 2022-04-03 18:37 ` [PATCH v6 09/12] clk: imx: scu: Fix kfree() of static memory on setting driver_override Krzysztof Kozlowski 2022-04-03 18:37 ` Krzysztof Kozlowski 2022-04-03 18:37 ` [PATCH v6 10/12] slimbus: qcom-ngd: " Krzysztof Kozlowski 2022-04-03 18:37 ` Krzysztof Kozlowski 2022-04-03 18:37 ` [PATCH v6 11/12] rpmsg: Constify local variable in field store macro Krzysztof Kozlowski 2022-04-03 18:37 ` Krzysztof Kozlowski 2022-04-03 18:37 ` [PATCH v6 12/12] rpmsg: Fix kfree() of static memory on setting driver_override Krzysztof Kozlowski 2022-04-03 18:37 ` Krzysztof Kozlowski 2022-04-12 14:10 ` Biju Das 2022-04-12 14:10 ` Biju Das 2022-04-12 14:10 ` Biju Das 2022-04-13 8:40 ` Krzysztof Kozlowski 2022-04-13 8:40 ` Krzysztof Kozlowski 2022-04-13 8:40 ` Krzysztof Kozlowski 2022-04-13 8:47 ` Biju Das 2022-04-13 8:47 ` Biju Das 2022-04-13 8:47 ` Biju Das
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=20220403183758.192236-3-krzysztof.kozlowski@linaro.org \ --to=krzysztof.kozlowski@linaro.org \ --cc=agordeev@linux.ibm.com \ --cc=agross@kernel.org \ --cc=alsa-devel@alsa-project.org \ --cc=andy.shevchenko@gmail.com \ --cc=bhelgaas@google.com \ --cc=bjorn.andersson@linaro.org \ --cc=borntraeger@linux.ibm.com \ --cc=decui@microsoft.com \ --cc=gor@linux.ibm.com \ --cc=gregkh@linuxfoundation.org \ --cc=haiyangz@microsoft.com \ --cc=hca@linux.ibm.com \ --cc=kys@microsoft.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-hyperv@vger.kernel.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=linux-remoteproc@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=linux-spi@vger.kernel.org \ --cc=linux@rasmusvillemoes.dk \ --cc=mathieu.poirier@linaro.org \ --cc=oberpar@linux.ibm.com \ --cc=rafael@kernel.org \ --cc=sthemmin@microsoft.com \ --cc=stuyoder@gmail.com \ --cc=svens@linux.ibm.com \ --cc=torvalds@linux-foundation.org \ --cc=virtualization@lists.linux-foundation.org \ --cc=vneethv@linux.ibm.com \ --cc=wei.liu@kernel.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.