aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wood <tommyandrena@gmail.com>2014-05-30 19:10:20 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-19 20:45:13 -0400
commit7242d42ace30825553eabd424b41b03136d37faa (patch)
treed01725e6ca366e33fb1902fe4c1a1f67684598cb
parentf80b2581a7068907076ca92c43866f36f446c039 (diff)
drivers/w1/w1_int.c: Fix style errors.
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> Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/w1/w1_int.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c
index 728039d2efe1..dfb6644028c0 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);
38static int w1_enable_pullup = 1; 38static int w1_enable_pullup = 1;
39module_param_named(enable_pullup, w1_enable_pullup, int, 0); 39module_param_named(enable_pullup, w1_enable_pullup, int, 0);
40 40
41static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl, 41static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl,
42 struct device_driver *driver, 42 struct device_driver *driver,
43 struct device *device) 43 struct device *device)
44{ 44{
@@ -116,13 +116,13 @@ int w1_add_master_device(struct w1_bus_master *master)
116 struct w1_netlink_msg msg; 116 struct w1_netlink_msg msg;
117 int id, found; 117 int id, found;
118 118
119 /* validate minimum functionality */ 119 /* validate minimum functionality */
120 if (!(master->touch_bit && master->reset_bus) && 120 if (!(master->touch_bit && master->reset_bus) &&
121 !(master->write_bit && master->read_bit) && 121 !(master->write_bit && master->read_bit) &&
122 !(master->write_byte && master->read_byte && master->reset_bus)) { 122 !(master->write_byte && master->read_byte && master->reset_bus)) {
123 printk(KERN_ERR "w1_add_master_device: invalid function set\n"); 123 printk(KERN_ERR "w1_add_master_device: invalid function set\n");
124 return(-EINVAL); 124 return(-EINVAL);
125 } 125 }
126 126
127 /* Lock until the device is added (or not) to w1_masters. */ 127 /* Lock until the device is added (or not) to w1_masters. */
128 mutex_lock(&w1_mlock); 128 mutex_lock(&w1_mlock);