From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de> To: Russell King <linux@armlinux.org.uk>, Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-kernel@vger.kernel.org, kernel@pengutronix.de, Arnd Bergmann <arnd@arndb.de>, linux-arm-kernel@lists.infradead.org, Ulf Hansson <ulf.hansson@linaro.org> Subject: [PATCH v3 2/5] amba: reorder functions Date: Tue, 26 Jan 2021 17:58:32 +0100 [thread overview] Message-ID: <20210126165835.687514-3-u.kleine-koenig@pengutronix.de> (raw) In-Reply-To: <20210126165835.687514-1-u.kleine-koenig@pengutronix.de> Put helpers (here: amba_get_enable_pclk and amba_put_disable_pclk) at the top of the file and then define callbacks directly before the structs they are used in; in the same order. Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/amba/bus.c | 77 +++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index b5f5ca4e3f34..8c4a42df47c6 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -56,31 +56,28 @@ amba_lookup(const struct amba_id *table, struct amba_device *dev) return NULL; } -static int amba_match(struct device *dev, struct device_driver *drv) +static int amba_get_enable_pclk(struct amba_device *pcdev) { - struct amba_device *pcdev = to_amba_device(dev); - struct amba_driver *pcdrv = to_amba_driver(drv); + int ret; - /* When driver_override is set, only bind to the matching driver */ - if (pcdev->driver_override) - return !strcmp(pcdev->driver_override, drv->name); + pcdev->pclk = clk_get(&pcdev->dev, "apb_pclk"); + if (IS_ERR(pcdev->pclk)) + return PTR_ERR(pcdev->pclk); - return amba_lookup(pcdrv->id_table, pcdev) != NULL; + ret = clk_prepare_enable(pcdev->pclk); + if (ret) + clk_put(pcdev->pclk); + + return ret; } -static int amba_uevent(struct device *dev, struct kobj_uevent_env *env) +static void amba_put_disable_pclk(struct amba_device *pcdev) { - struct amba_device *pcdev = to_amba_device(dev); - int retval = 0; - - retval = add_uevent_var(env, "AMBA_ID=%08x", pcdev->periphid); - if (retval) - return retval; - - retval = add_uevent_var(env, "MODALIAS=amba:d%08X", pcdev->periphid); - return retval; + clk_disable_unprepare(pcdev->pclk); + clk_put(pcdev->pclk); } + static ssize_t driver_override_show(struct device *_dev, struct device_attribute *attr, char *buf) { @@ -152,6 +149,31 @@ static struct attribute *amba_dev_attrs[] = { }; ATTRIBUTE_GROUPS(amba_dev); +static int amba_match(struct device *dev, struct device_driver *drv) +{ + struct amba_device *pcdev = to_amba_device(dev); + struct amba_driver *pcdrv = to_amba_driver(drv); + + /* When driver_override is set, only bind to the matching driver */ + if (pcdev->driver_override) + return !strcmp(pcdev->driver_override, drv->name); + + return amba_lookup(pcdrv->id_table, pcdev) != NULL; +} + +static int amba_uevent(struct device *dev, struct kobj_uevent_env *env) +{ + struct amba_device *pcdev = to_amba_device(dev); + int retval = 0; + + retval = add_uevent_var(env, "AMBA_ID=%08x", pcdev->periphid); + if (retval) + return retval; + + retval = add_uevent_var(env, "MODALIAS=amba:d%08X", pcdev->periphid); + return retval; +} + #ifdef CONFIG_PM /* * Hooks to provide runtime PM of the pclk (bus clock). It is safe to @@ -229,27 +251,6 @@ static int __init amba_init(void) postcore_initcall(amba_init); -static int amba_get_enable_pclk(struct amba_device *pcdev) -{ - int ret; - - pcdev->pclk = clk_get(&pcdev->dev, "apb_pclk"); - if (IS_ERR(pcdev->pclk)) - return PTR_ERR(pcdev->pclk); - - ret = clk_prepare_enable(pcdev->pclk); - if (ret) - clk_put(pcdev->pclk); - - return ret; -} - -static void amba_put_disable_pclk(struct amba_device *pcdev) -{ - clk_disable_unprepare(pcdev->pclk); - clk_put(pcdev->pclk); -} - /* * These are the device model conversion veneers; they convert the * device model structures to our more specific structures. -- 2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de> To: Russell King <linux@armlinux.org.uk>, Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-arm-kernel@lists.infradead.org, Ulf Hansson <ulf.hansson@linaro.org>, Arnd Bergmann <arnd@arndb.de>, linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH v3 2/5] amba: reorder functions Date: Tue, 26 Jan 2021 17:58:32 +0100 [thread overview] Message-ID: <20210126165835.687514-3-u.kleine-koenig@pengutronix.de> (raw) In-Reply-To: <20210126165835.687514-1-u.kleine-koenig@pengutronix.de> Put helpers (here: amba_get_enable_pclk and amba_put_disable_pclk) at the top of the file and then define callbacks directly before the structs they are used in; in the same order. Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/amba/bus.c | 77 +++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index b5f5ca4e3f34..8c4a42df47c6 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c @@ -56,31 +56,28 @@ amba_lookup(const struct amba_id *table, struct amba_device *dev) return NULL; } -static int amba_match(struct device *dev, struct device_driver *drv) +static int amba_get_enable_pclk(struct amba_device *pcdev) { - struct amba_device *pcdev = to_amba_device(dev); - struct amba_driver *pcdrv = to_amba_driver(drv); + int ret; - /* When driver_override is set, only bind to the matching driver */ - if (pcdev->driver_override) - return !strcmp(pcdev->driver_override, drv->name); + pcdev->pclk = clk_get(&pcdev->dev, "apb_pclk"); + if (IS_ERR(pcdev->pclk)) + return PTR_ERR(pcdev->pclk); - return amba_lookup(pcdrv->id_table, pcdev) != NULL; + ret = clk_prepare_enable(pcdev->pclk); + if (ret) + clk_put(pcdev->pclk); + + return ret; } -static int amba_uevent(struct device *dev, struct kobj_uevent_env *env) +static void amba_put_disable_pclk(struct amba_device *pcdev) { - struct amba_device *pcdev = to_amba_device(dev); - int retval = 0; - - retval = add_uevent_var(env, "AMBA_ID=%08x", pcdev->periphid); - if (retval) - return retval; - - retval = add_uevent_var(env, "MODALIAS=amba:d%08X", pcdev->periphid); - return retval; + clk_disable_unprepare(pcdev->pclk); + clk_put(pcdev->pclk); } + static ssize_t driver_override_show(struct device *_dev, struct device_attribute *attr, char *buf) { @@ -152,6 +149,31 @@ static struct attribute *amba_dev_attrs[] = { }; ATTRIBUTE_GROUPS(amba_dev); +static int amba_match(struct device *dev, struct device_driver *drv) +{ + struct amba_device *pcdev = to_amba_device(dev); + struct amba_driver *pcdrv = to_amba_driver(drv); + + /* When driver_override is set, only bind to the matching driver */ + if (pcdev->driver_override) + return !strcmp(pcdev->driver_override, drv->name); + + return amba_lookup(pcdrv->id_table, pcdev) != NULL; +} + +static int amba_uevent(struct device *dev, struct kobj_uevent_env *env) +{ + struct amba_device *pcdev = to_amba_device(dev); + int retval = 0; + + retval = add_uevent_var(env, "AMBA_ID=%08x", pcdev->periphid); + if (retval) + return retval; + + retval = add_uevent_var(env, "MODALIAS=amba:d%08X", pcdev->periphid); + return retval; +} + #ifdef CONFIG_PM /* * Hooks to provide runtime PM of the pclk (bus clock). It is safe to @@ -229,27 +251,6 @@ static int __init amba_init(void) postcore_initcall(amba_init); -static int amba_get_enable_pclk(struct amba_device *pcdev) -{ - int ret; - - pcdev->pclk = clk_get(&pcdev->dev, "apb_pclk"); - if (IS_ERR(pcdev->pclk)) - return PTR_ERR(pcdev->pclk); - - ret = clk_prepare_enable(pcdev->pclk); - if (ret) - clk_put(pcdev->pclk); - - return ret; -} - -static void amba_put_disable_pclk(struct amba_device *pcdev) -{ - clk_disable_unprepare(pcdev->pclk); - clk_put(pcdev->pclk); -} - /* * These are the device model conversion veneers; they convert the * device model structures to our more specific structures. -- 2.29.2 _______________________________________________ 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:[~2021-01-27 7:46 UTC|newest] Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-26 16:58 [PATCH v3 0/5] amba: minor fix and various cleanups Uwe Kleine-König 2021-01-26 16:58 ` Uwe Kleine-König 2021-01-26 16:58 ` Uwe Kleine-König 2021-01-26 16:58 ` [PATCH v3 1/5] amba: Fix resource leak for drivers without .remove Uwe Kleine-König 2021-01-26 16:58 ` Uwe Kleine-König 2021-01-26 16:58 ` Uwe Kleine-König [this message] 2021-01-26 16:58 ` [PATCH v3 2/5] amba: reorder functions Uwe Kleine-König 2021-01-26 16:58 ` [PATCH v3 3/5] vfio: platform: simplify device removal Uwe Kleine-König 2021-01-26 16:58 ` Uwe Kleine-König 2021-01-26 16:58 ` [PATCH v3 4/5] amba: Make the remove callback return void Uwe Kleine-König 2021-01-26 16:58 ` Uwe Kleine-König 2021-01-26 16:58 ` Uwe Kleine-König 2021-01-26 17:08 ` Suzuki K Poulose 2021-01-26 17:08 ` Suzuki K Poulose 2021-01-26 17:08 ` Suzuki K Poulose 2021-01-26 17:56 ` Uwe Kleine-König 2021-01-26 17:56 ` Uwe Kleine-König 2021-01-26 17:56 ` Uwe Kleine-König 2021-01-26 19:05 ` Russell King - ARM Linux admin 2021-01-26 19:05 ` Russell King - ARM Linux admin 2021-01-26 19:05 ` Russell King - ARM Linux admin 2021-01-26 17:30 ` Vinod Koul 2021-01-26 17:30 ` Vinod Koul 2021-01-26 17:30 ` Vinod Koul 2021-01-26 19:24 ` Guenter Roeck 2021-01-26 19:24 ` Guenter Roeck 2021-01-26 19:24 ` Guenter Roeck 2021-01-27 6:47 ` Wolfram Sang 2021-01-27 6:47 ` Wolfram Sang 2021-01-27 6:47 ` Wolfram Sang 2021-01-27 6:50 ` Takashi Iwai 2021-01-27 6:50 ` Takashi Iwai 2021-01-27 6:50 ` Takashi Iwai 2021-01-27 8:12 ` Vladimir Zapolskiy 2021-01-27 8:12 ` Vladimir Zapolskiy 2021-01-27 8:12 ` Vladimir Zapolskiy 2021-01-27 12:03 ` Greg Kroah-Hartman 2021-01-27 12:03 ` Greg Kroah-Hartman 2021-01-27 12:03 ` Greg Kroah-Hartman 2021-02-03 13:18 ` Auger Eric 2021-02-03 13:18 ` Auger Eric 2021-02-03 13:18 ` Auger Eric 2021-01-26 16:58 ` [PATCH v3 5/5] amba: Make use of bus_type functions Uwe Kleine-König 2021-01-26 16:58 ` Uwe Kleine-König 2021-02-02 10:49 ` [PATCH v3 0/5] amba: minor fix and various cleanups Russell King - ARM Linux admin 2021-02-02 10:49 ` Russell King - ARM Linux admin 2021-02-02 10:49 ` Russell King - ARM Linux admin 2021-02-03 7:45 ` Uwe Kleine-König 2021-02-03 7:45 ` Uwe Kleine-König 2021-02-03 7:45 ` Uwe Kleine-König 2021-02-02 13:53 ` [GIT PULL] immutable branch for amba changes targeting v5.12-rc1 Uwe Kleine-König 2021-02-02 13:53 ` Uwe Kleine-König 2021-02-02 13:53 ` Uwe Kleine-König 2021-02-02 14:06 ` Greg Kroah-Hartman 2021-02-02 14:06 ` Greg Kroah-Hartman 2021-02-02 14:06 ` Greg Kroah-Hartman 2021-02-04 16:52 ` Russell King - ARM Linux admin 2021-02-04 16:52 ` Russell King - ARM Linux admin 2021-02-04 16:52 ` Russell King - ARM Linux admin 2021-02-04 16:56 ` Greg Kroah-Hartman 2021-02-04 16:56 ` Greg Kroah-Hartman 2021-02-04 16:56 ` Greg Kroah-Hartman 2021-02-04 16:59 ` Russell King - ARM Linux admin 2021-02-04 16:59 ` Russell King - ARM Linux admin 2021-02-04 16:59 ` Russell King - ARM Linux admin 2021-02-04 18:15 ` Uwe Kleine-König 2021-02-04 18:15 ` Uwe Kleine-König 2021-02-04 18:15 ` Uwe Kleine-König 2021-02-05 9:37 ` Uwe Kleine-König 2021-02-05 9:37 ` Uwe Kleine-König 2021-02-05 9:37 ` Uwe Kleine-König 2021-02-05 10:18 ` Greg Kroah-Hartman 2021-02-05 10:18 ` Greg Kroah-Hartman 2021-02-05 10:18 ` Greg Kroah-Hartman 2021-02-05 10:56 ` Uwe Kleine-König 2021-02-05 10:56 ` Uwe Kleine-König 2021-02-05 10:56 ` Uwe Kleine-König 2021-02-05 11:07 ` Greg Kroah-Hartman 2021-02-05 11:07 ` Greg Kroah-Hartman 2021-02-05 11:07 ` Greg Kroah-Hartman 2021-02-02 19:43 ` [PATCH] mailbox: arm_mhuv2: make remove callback return void Uwe Kleine-König 2021-02-02 19:43 ` Uwe Kleine-König 2021-02-02 19:43 ` Uwe Kleine-König 2021-02-03 2:57 ` Viresh Kumar 2021-02-03 2:57 ` Viresh Kumar 2021-02-03 2:57 ` Viresh Kumar 2021-02-02 21:35 ` [GIT PULL] immutable branch for amba changes targeting v5.12-rc1 Uwe Kleine-König 2021-02-02 21:35 ` Uwe Kleine-König 2021-02-02 21:35 ` Uwe Kleine-König
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=20210126165835.687514-3-u.kleine-koenig@pengutronix.de \ --to=u.kleine-koenig@pengutronix.de \ --cc=arnd@arndb.de \ --cc=gregkh@linuxfoundation.org \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=ulf.hansson@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.