diff options
Diffstat (limited to 'drivers/w1/ds_w1_bridge.c')
-rw-r--r-- | drivers/w1/ds_w1_bridge.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/w1/ds_w1_bridge.c b/drivers/w1/ds_w1_bridge.c index 7bddd8ac7d7f..a79d16d5666f 100644 --- a/drivers/w1/ds_w1_bridge.c +++ b/drivers/w1/ds_w1_bridge.c | |||
@@ -1,8 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * ds_w1_bridge.c | 2 | * ds_w1_bridge.c |
3 | * | 3 | * |
4 | * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru> | 4 | * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru> |
5 | * | 5 | * |
6 | * | 6 | * |
7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by | 8 | * it under the terms of the GNU General Public License as published by |
@@ -25,7 +25,7 @@ | |||
25 | #include "../w1/w1.h" | 25 | #include "../w1/w1.h" |
26 | #include "../w1/w1_int.h" | 26 | #include "../w1/w1_int.h" |
27 | #include "dscore.h" | 27 | #include "dscore.h" |
28 | 28 | ||
29 | static struct ds_device *ds_dev; | 29 | static struct ds_device *ds_dev; |
30 | static struct w1_bus_master *ds_bus_master; | 30 | static struct w1_bus_master *ds_bus_master; |
31 | 31 | ||
@@ -120,7 +120,7 @@ static u8 ds9490r_reset(unsigned long data) | |||
120 | static int __devinit ds_w1_init(void) | 120 | static int __devinit ds_w1_init(void) |
121 | { | 121 | { |
122 | int err; | 122 | int err; |
123 | 123 | ||
124 | ds_bus_master = kmalloc(sizeof(*ds_bus_master), GFP_KERNEL); | 124 | ds_bus_master = kmalloc(sizeof(*ds_bus_master), GFP_KERNEL); |
125 | if (!ds_bus_master) { | 125 | if (!ds_bus_master) { |
126 | printk(KERN_ERR "Failed to allocate DS9490R USB<->W1 bus_master structure.\n"); | 126 | printk(KERN_ERR "Failed to allocate DS9490R USB<->W1 bus_master structure.\n"); |
@@ -136,14 +136,14 @@ static int __devinit ds_w1_init(void) | |||
136 | 136 | ||
137 | memset(ds_bus_master, 0, sizeof(*ds_bus_master)); | 137 | memset(ds_bus_master, 0, sizeof(*ds_bus_master)); |
138 | 138 | ||
139 | ds_bus_master->data = (unsigned long)ds_dev; | 139 | ds_bus_master->data = (unsigned long)ds_dev; |
140 | ds_bus_master->touch_bit = &ds9490r_touch_bit; | 140 | ds_bus_master->touch_bit = &ds9490r_touch_bit; |
141 | ds_bus_master->read_bit = &ds9490r_read_bit; | 141 | ds_bus_master->read_bit = &ds9490r_read_bit; |
142 | ds_bus_master->write_bit = &ds9490r_write_bit; | 142 | ds_bus_master->write_bit = &ds9490r_write_bit; |
143 | ds_bus_master->read_byte = &ds9490r_read_byte; | 143 | ds_bus_master->read_byte = &ds9490r_read_byte; |
144 | ds_bus_master->write_byte = &ds9490r_write_byte; | 144 | ds_bus_master->write_byte = &ds9490r_write_byte; |
145 | ds_bus_master->read_block = &ds9490r_read_block; | 145 | ds_bus_master->read_block = &ds9490r_read_block; |
146 | ds_bus_master->write_block = &ds9490r_write_block; | 146 | ds_bus_master->write_block = &ds9490r_write_block; |
147 | ds_bus_master->reset_bus = &ds9490r_reset; | 147 | ds_bus_master->reset_bus = &ds9490r_reset; |
148 | 148 | ||
149 | err = w1_add_master_device(ds_bus_master); | 149 | err = w1_add_master_device(ds_bus_master); |