* [PATCH] drivers/w1/w1_int.c: Fix style errors.
@ 2014-05-30 23:10 Thomas Wood
2014-05-31 12:25 ` Evgeniy Polyakov
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Wood @ 2014-05-30 23:10 UTC (permalink / raw)
To: zbr; +Cc: linux-kernel, Thomas Wood
Replace spaces at beginning of the string with tabs, and replace foo * bar with foo *bar in a pointer declaration.
Signed-off-by: Thomas Wood <tommyandrena@gmail.com>
---
This time using linux-next!
drivers/w1/w1_int.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index ec3fc93..3c26a58 100644
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
@@ -38,7 +38,7 @@ module_param_named(search_count, w1_search_count, int, 0);
static int w1_enable_pullup = 1;
module_param_named(enable_pullup, w1_enable_pullup, int, 0);
-static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
+static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
struct device_driver *driver,
struct device *device)
{
@@ -115,13 +115,13 @@ int w1_add_master_device(struct w1_bus_master *master)
struct w1_netlink_msg msg;
int id, found;
- /* validate minimum functionality */
- if (!(master->touch_bit && master->reset_bus) &&
- !(master->write_bit && master->read_bit) &&
+ /* validate minimum functionality */
+ if (!(master->touch_bit && master->reset_bus) &&
+ !(master->write_bit && master->read_bit) &&
!(master->write_byte && master->read_byte && master->reset_bus)) {
printk(KERN_ERR "w1_add_master_device: invalid function set\n");
return(-EINVAL);
- }
+ }
/* Lock until the device is added (or not) to w1_masters. */
mutex_lock(&w1_mlock);
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drivers/w1/w1_int.c: Fix style errors.
2014-05-30 23:10 [PATCH] drivers/w1/w1_int.c: Fix style errors Thomas Wood
@ 2014-05-31 12:25 ` Evgeniy Polyakov
2014-06-06 23:32 ` GregKH
0 siblings, 1 reply; 3+ messages in thread
From: Evgeniy Polyakov @ 2014-05-31 12:25 UTC (permalink / raw)
To: Thomas Wood; +Cc: linux-kernel, GregKH
Hi Thomas
31.05.2014, 03:11, "Thomas Wood" <tommyandrena@gmail.com>:
> Replace spaces at beginning of the string with tabs, and replace foo * bar with foo *bar in a pointer declaration.
>
> Signed-off-by: Thomas Wood <tommyandrena@gmail.com>
Looks good, thank you.
Greg, please pull it into your tree or suggest appropriate.
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drivers/w1/w1_int.c: Fix style errors.
2014-05-31 12:25 ` Evgeniy Polyakov
@ 2014-06-06 23:32 ` GregKH
0 siblings, 0 replies; 3+ messages in thread
From: GregKH @ 2014-06-06 23:32 UTC (permalink / raw)
To: Evgeniy Polyakov; +Cc: Thomas Wood, linux-kernel
On Sat, May 31, 2014 at 04:25:21PM +0400, Evgeniy Polyakov wrote:
> Hi Thomas
>
> 31.05.2014, 03:11, "Thomas Wood" <tommyandrena@gmail.com>:
> > Replace spaces at beginning of the string with tabs, and replace foo * bar with foo *bar in a pointer declaration.
> >
> > Signed-off-by: Thomas Wood <tommyandrena@gmail.com>
>
> Looks good, thank you.
> Greg, please pull it into your tree or suggest appropriate.
>
> Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Thanks, I'll take this after 3.16-rc1 is out.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-06-06 23:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-05-30 23:10 [PATCH] drivers/w1/w1_int.c: Fix style errors Thomas Wood
2014-05-31 12:25 ` Evgeniy Polyakov
2014-06-06 23:32 ` GregKH
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).