diff options
Diffstat (limited to 'drivers/w1')
| -rw-r--r-- | drivers/w1/masters/ds2482.c | 2 | ||||
| -rw-r--r-- | drivers/w1/masters/ds2490.c | 16 | ||||
| -rw-r--r-- | drivers/w1/masters/mxc_w1.c | 1 |
3 files changed, 9 insertions, 10 deletions
diff --git a/drivers/w1/masters/ds2482.c b/drivers/w1/masters/ds2482.c index 5b3e017d9276..8b5e598ffdb3 100644 --- a/drivers/w1/masters/ds2482.c +++ b/drivers/w1/masters/ds2482.c @@ -71,7 +71,7 @@ MODULE_PARM_DESC(active_pullup, "Active pullup (apply to all buses): " \ #define DS2482_REG_CFG_APU 0x01 /* active pull-up */ /* extra configurations - e.g. 1WS */ -int extra_config; +static int extra_config; /** * Write and verify codes for the CHANNEL_SELECT command (DS2482-800 only). diff --git a/drivers/w1/masters/ds2490.c b/drivers/w1/masters/ds2490.c index c423bdb982bb..0f4ecfcdb549 100644 --- a/drivers/w1/masters/ds2490.c +++ b/drivers/w1/masters/ds2490.c @@ -134,8 +134,7 @@ #define EP_DATA_OUT 2 #define EP_DATA_IN 3 -struct ds_device -{ +struct ds_device { struct list_head ds_entry; struct usb_device *udev; @@ -158,8 +157,7 @@ struct ds_device struct w1_bus_master master; }; -struct ds_status -{ +struct ds_status { u8 enable; u8 speed; u8 pullup_dur; @@ -236,7 +234,7 @@ static void ds_dump_status(struct ds_device *dev, unsigned char *buf, int count) int i; pr_info("0x%x: count=%d, status: ", dev->ep[EP_STATUS], count); - for (i=0; i<count; ++i) + for (i = 0; i < count; ++i) pr_info("%02x ", buf[i]); pr_info("\n"); @@ -358,7 +356,7 @@ static int ds_recv_data(struct ds_device *dev, unsigned char *buf, int size) int i; printk("%s: count=%d: ", __func__, count); - for (i=0; i<count; ++i) + for (i = 0; i < count; ++i) printk("%02x ", buf[i]); printk("\n"); } @@ -404,7 +402,7 @@ int ds_stop_pulse(struct ds_device *dev, int limit) if (err) break; } - } while(++count < limit); + } while (++count < limit); return err; } @@ -447,7 +445,7 @@ static int ds_wait_status(struct ds_device *dev, struct ds_status *st) if (err >= 0) { int i; printk("0x%x: count=%d, status: ", dev->ep[EP_STATUS], err); - for (i=0; i<err; ++i) + for (i = 0; i < err; ++i) printk("%02x ", dev->st_buf[i]); printk("\n"); } @@ -613,7 +611,7 @@ static int ds_read_byte(struct ds_device *dev, u8 *byte) int err; struct ds_status st; - err = ds_send_control(dev, COMM_BYTE_IO | COMM_IM , 0xff); + err = ds_send_control(dev, COMM_BYTE_IO | COMM_IM, 0xff); if (err) return err; diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index 8851d441e5fd..50b46c4399ea 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c @@ -17,6 +17,7 @@ #include <linux/io.h> #include <linux/jiffies.h> #include <linux/module.h> +#include <linux/mod_devicetable.h> #include <linux/platform_device.h> #include <linux/w1.h> |