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
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/