From: Greg KH <gregkh@linuxfoundation.org>
To: Dan Williams <dan.j.williams@intel.com>
Cc: broonie@kernel.org, lgirdwood@gmail.com, davem@davemloft.net,
kuba@kernel.org, jgg@nvidia.com,
Kiran Patil <kiran.patil@intel.com>,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
Fred Oh <fred.oh@linux.intel.com>,
Leon Romanovsky <leonro@nvidia.com>,
Dave Ertman <david.m.ertman@intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Shiraz Saleem <shiraz.saleem@intel.com>,
Parav Pandit <parav@mellanox.com>,
Martin Habets <mhabets@solarflare.com>,
linux-rdma@vger.kernel.org, netdev@vger.kernel.org,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] driver core: auxiliary bus: minor coding style tweaks
Date: Fri, 4 Dec 2020 12:44:24 +0100 [thread overview]
Message-ID: <X8ohGE8IBKiafzka@kroah.com> (raw)
In-Reply-To: <X8ohB1ks1NK7kPop@kroah.com>
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
For some reason, the original aux bus patch had some really long lines
in a few places, probably due to it being a very long-lived patch in
development by many different people. Fix that up so that the two files
all have the same length lines and function formatting styles.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/base/Kconfig | 2 +-
drivers/base/auxiliary.c | 58 ++++++++++++++++++++++------------------
2 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index 040be48ce046..ba52b2c40202 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -2,7 +2,7 @@
menu "Generic Driver Options"
config AUXILIARY_BUS
- bool
+ tristate "aux bus!"
config UEVENT_HELPER
bool "Support for uevent helper"
diff --git a/drivers/base/auxiliary.c b/drivers/base/auxiliary.c
index c44e85802b43..f303daadf843 100644
--- a/drivers/base/auxiliary.c
+++ b/drivers/base/auxiliary.c
@@ -50,8 +50,8 @@ static int auxiliary_uevent(struct device *dev, struct kobj_uevent_env *env)
name = dev_name(dev);
p = strrchr(name, '.');
- return add_uevent_var(env, "MODALIAS=%s%.*s", AUXILIARY_MODULE_PREFIX, (int)(p - name),
- name);
+ return add_uevent_var(env, "MODALIAS=%s%.*s", AUXILIARY_MODULE_PREFIX,
+ (int)(p - name), name);
}
static const struct dev_pm_ops auxiliary_dev_pm_ops = {
@@ -113,16 +113,18 @@ static struct bus_type auxiliary_bus_type = {
* auxiliary_device_init - check auxiliary_device and initialize
* @auxdev: auxiliary device struct
*
- * This is the first step in the two-step process to register an auxiliary_device.
+ * This is the first step in the two-step process to register an
+ * auxiliary_device.
*
- * When this function returns an error code, then the device_initialize will *not* have
- * been performed, and the caller will be responsible to free any memory allocated for the
- * auxiliary_device in the error path directly.
+ * When this function returns an error code, then the device_initialize will
+ * *not* have been performed, and the caller will be responsible to free any
+ * memory allocated for the auxiliary_device in the error path directly.
*
- * It returns 0 on success. On success, the device_initialize has been performed. After this
- * point any error unwinding will need to include a call to auxiliary_device_uninit().
- * In this post-initialize error scenario, a call to the device's .release callback will be
- * triggered, and all memory clean-up is expected to be handled there.
+ * It returns 0 on success. On success, the device_initialize has been
+ * performed. After this point any error unwinding will need to include a call
+ * to auxiliary_device_uninit(). In this post-initialize error scenario, a call
+ * to the device's .release callback will be triggered, and all memory clean-up
+ * is expected to be handled there.
*/
int auxiliary_device_init(struct auxiliary_device *auxdev)
{
@@ -149,16 +151,19 @@ EXPORT_SYMBOL_GPL(auxiliary_device_init);
* @auxdev: auxiliary bus device to add to the bus
* @modname: name of the parent device's driver module
*
- * This is the second step in the two-step process to register an auxiliary_device.
+ * This is the second step in the two-step process to register an
+ * auxiliary_device.
*
- * This function must be called after a successful call to auxiliary_device_init(), which
- * will perform the device_initialize. This means that if this returns an error code, then a
- * call to auxiliary_device_uninit() must be performed so that the .release callback will
- * be triggered to free the memory associated with the auxiliary_device.
+ * This function must be called after a successful call to
+ * auxiliary_device_init(), which will perform the device_initialize. This
+ * means that if this returns an error code, then a call to
+ * auxiliary_device_uninit() must be performed so that the .release callback
+ * will be triggered to free the memory associated with the auxiliary_device.
*
- * The expectation is that users will call the "auxiliary_device_add" macro so that the caller's
- * KBUILD_MODNAME is automatically inserted for the modname parameter. Only if a user requires
- * a custom name would this version be called directly.
+ * The expectation is that users will call the "auxiliary_device_add" macro so
+ * that the caller's KBUILD_MODNAME is automatically inserted for the modname
+ * parameter. Only if a user requires a custom name would this version be
+ * called directly.
*/
int __auxiliary_device_add(struct auxiliary_device *auxdev, const char *modname)
{
@@ -166,13 +171,13 @@ int __auxiliary_device_add(struct auxiliary_device *auxdev, const char *modname)
int ret;
if (!modname) {
- pr_err("auxiliary device modname is NULL\n");
+ dev_err(dev, "auxiliary device modname is NULL\n");
return -EINVAL;
}
ret = dev_set_name(dev, "%s.%s.%d", modname, auxdev->name, auxdev->id);
if (ret) {
- pr_err("auxiliary device dev_set_name failed: %d\n", ret);
+ dev_err(dev, "auxiliary device dev_set_name failed: %d\n", ret);
return ret;
}
@@ -197,9 +202,9 @@ EXPORT_SYMBOL_GPL(__auxiliary_device_add);
* if it does. If the callback returns non-zero, this function will
* return to the caller and not iterate over any more devices.
*/
-struct auxiliary_device *
-auxiliary_find_device(struct device *start, const void *data,
- int (*match)(struct device *dev, const void *data))
+struct auxiliary_device *auxiliary_find_device(struct device *start,
+ const void *data,
+ int (*match)(struct device *dev, const void *data))
{
struct device *dev;
@@ -217,14 +222,15 @@ EXPORT_SYMBOL_GPL(auxiliary_find_device);
* @owner: owning module/driver
* @modname: KBUILD_MODNAME for parent driver
*/
-int __auxiliary_driver_register(struct auxiliary_driver *auxdrv, struct module *owner,
- const char *modname)
+int __auxiliary_driver_register(struct auxiliary_driver *auxdrv,
+ struct module *owner, const char *modname)
{
if (WARN_ON(!auxdrv->probe) || WARN_ON(!auxdrv->id_table))
return -EINVAL;
if (auxdrv->name)
- auxdrv->driver.name = kasprintf(GFP_KERNEL, "%s.%s", modname, auxdrv->name);
+ auxdrv->driver.name = kasprintf(GFP_KERNEL, "%s.%s", modname,
+ auxdrv->name);
else
auxdrv->driver.name = kasprintf(GFP_KERNEL, "%s", modname);
if (!auxdrv->driver.name)
--
2.29.2
next prev parent reply other threads:[~2020-12-04 11:44 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-03 0:54 [resend/standalone PATCH v4] Add auxiliary bus support Dan Williams
2020-12-03 15:06 ` Greg KH
2020-12-04 2:33 ` Jason Gunthorpe
2020-12-04 3:37 ` Dan Williams
2020-12-03 15:07 ` Greg KH
2020-12-03 15:55 ` Leon Romanovsky
2020-12-04 11:42 ` Greg KH
2020-12-04 11:43 ` [PATCH 1/3] driver core: auxiliary bus: move slab.h from include file Greg KH
2020-12-04 11:44 ` [PATCH 2/3] driver core: auxiliary bus: make remove function return void Greg KH
2020-12-04 11:44 ` Greg KH [this message]
2020-12-04 11:48 ` [PATCH 3/3] driver core: auxiliary bus: minor coding style tweaks Greg KH
2020-12-04 11:49 ` [PATCH v2 " Greg KH
2020-12-04 12:32 ` [resend/standalone PATCH v4] Add auxiliary bus support Leon Romanovsky
2020-12-04 12:43 ` Parav Pandit
2020-12-04 12:59 ` Greg KH
2020-12-04 17:10 ` Ranjani Sridharan
2020-12-05 9:02 ` Greg KH
2020-12-04 16:41 ` Dan Williams
2020-12-05 15:51 ` Greg KH
2020-12-17 21:19 ` Alexandre Belloni
2020-12-18 2:39 ` Dan Williams
2020-12-18 14:20 ` Mark Brown
2020-12-18 7:10 ` Greg KH
2020-12-18 13:17 ` Mark Brown
2020-12-18 13:46 ` Lee Jones
2020-12-18 14:08 ` Jason Gunthorpe
2020-12-18 15:52 ` Mark Brown
2020-12-18 16:28 ` Jason Gunthorpe
2020-12-18 17:15 ` Alexandre Belloni
2020-12-18 18:03 ` Mark Brown
2020-12-18 18:41 ` Jason Gunthorpe
2020-12-18 19:09 ` Lee Jones
2020-12-18 20:14 ` Jason Gunthorpe
2020-12-18 20:32 ` Mark Brown
2020-12-18 20:58 ` Jason Gunthorpe
2020-12-18 21:16 ` Alexandre Belloni
2020-12-18 22:36 ` Dan Williams
2020-12-18 23:36 ` Jason Gunthorpe
2020-12-19 0:22 ` Alexandre Belloni
2020-12-21 18:51 ` Mark Brown
2021-01-04 18:08 ` Jason Gunthorpe
2021-01-04 21:19 ` Mark Brown
2021-01-05 0:13 ` Jason Gunthorpe
2021-01-05 0:51 ` Dan Williams
2021-01-05 1:53 ` Jason Gunthorpe
2021-01-05 3:12 ` Dan Williams
2021-01-05 12:49 ` Jason Gunthorpe
2021-01-05 13:42 ` Mark Brown
2021-01-05 14:36 ` Jason Gunthorpe
2021-01-05 15:47 ` Mark Brown
2020-12-04 12:35 ` Greg KH
2020-12-04 12:54 ` Leon Romanovsky
2020-12-04 16:25 ` Jakub Kicinski
2020-12-04 17:57 ` Saeed Mahameed
2020-12-04 18:05 ` Ranjani Sridharan
2020-12-06 0:24 ` David Ahern
2020-12-06 0:32 ` Dan Williams
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=X8ohGE8IBKiafzka@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=dan.j.williams@intel.com \
--cc=davem@davemloft.net \
--cc=david.m.ertman@intel.com \
--cc=fred.oh@linux.intel.com \
--cc=jgg@nvidia.com \
--cc=kiran.patil@intel.com \
--cc=kuba@kernel.org \
--cc=leonro@nvidia.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=mhabets@solarflare.com \
--cc=netdev@vger.kernel.org \
--cc=parav@mellanox.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=shiraz.saleem@intel.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).