diff options
author | Ian Abbott <abbotti@mev.co.uk> | 2012-09-21 07:05:45 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-26 12:35:50 -0400 |
commit | 9d54814f31ea4f577db2b2d49c00b2f9bcb0c124 (patch) | |
tree | cdcd7bbb7de83b6222f855470598e50db676e8be /drivers | |
parent | 4b0cb3cb3bf96fd22bc9c5b0de5a3751f18e8fb6 (diff) |
staging: comedi: ni_daq_700: use prefix daq700
Rename a few functions and variables to use the prefix `daq700` instead
of the prefix or suffix `dio700`.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/comedi/drivers/ni_daq_700.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index 7355860bce26..53bce6c81cf4 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c | |||
@@ -51,7 +51,7 @@ emu as port A output, port B input, port C N/A). | |||
51 | 51 | ||
52 | static struct pcmcia_device *pcmcia_cur_dev; | 52 | static struct pcmcia_device *pcmcia_cur_dev; |
53 | 53 | ||
54 | struct dio700_board { | 54 | struct daq700_board { |
55 | const char *name; | 55 | const char *name; |
56 | }; | 56 | }; |
57 | 57 | ||
@@ -97,9 +97,9 @@ static int subdev_700_insn_config(struct comedi_device *dev, | |||
97 | return insn->n; | 97 | return insn->n; |
98 | } | 98 | } |
99 | 99 | ||
100 | static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it) | 100 | static int daq700_attach(struct comedi_device *dev, struct comedi_devconfig *it) |
101 | { | 101 | { |
102 | const struct dio700_board *thisboard = comedi_board(dev); | 102 | const struct daq700_board *thisboard = comedi_board(dev); |
103 | struct comedi_subdevice *s; | 103 | struct comedi_subdevice *s; |
104 | struct pcmcia_device *link; | 104 | struct pcmcia_device *link; |
105 | int ret; | 105 | int ret; |
@@ -141,12 +141,12 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
141 | return 0; | 141 | return 0; |
142 | } | 142 | } |
143 | 143 | ||
144 | static void dio700_detach(struct comedi_device *dev) | 144 | static void daq700_detach(struct comedi_device *dev) |
145 | { | 145 | { |
146 | /* nothing to cleanup */ | 146 | /* nothing to cleanup */ |
147 | } | 147 | } |
148 | 148 | ||
149 | static const struct dio700_board dio700_boards[] = { | 149 | static const struct daq700_board daq700_boards[] = { |
150 | { | 150 | { |
151 | .name = "daqcard-700", | 151 | .name = "daqcard-700", |
152 | }, { | 152 | }, { |
@@ -154,17 +154,17 @@ static const struct dio700_board dio700_boards[] = { | |||
154 | }, | 154 | }, |
155 | }; | 155 | }; |
156 | 156 | ||
157 | static struct comedi_driver driver_dio700 = { | 157 | static struct comedi_driver daq700_driver = { |
158 | .driver_name = "ni_daq_700", | 158 | .driver_name = "ni_daq_700", |
159 | .module = THIS_MODULE, | 159 | .module = THIS_MODULE, |
160 | .attach = dio700_attach, | 160 | .attach = daq700_attach, |
161 | .detach = dio700_detach, | 161 | .detach = daq700_detach, |
162 | .board_name = &dio700_boards[0].name, | 162 | .board_name = &daq700_boards[0].name, |
163 | .num_names = ARRAY_SIZE(dio700_boards), | 163 | .num_names = ARRAY_SIZE(daq700_boards), |
164 | .offset = sizeof(struct dio700_board), | 164 | .offset = sizeof(struct daq700_board), |
165 | }; | 165 | }; |
166 | 166 | ||
167 | static int dio700_pcmcia_config_loop(struct pcmcia_device *p_dev, | 167 | static int daq700_pcmcia_config_loop(struct pcmcia_device *p_dev, |
168 | void *priv_data) | 168 | void *priv_data) |
169 | { | 169 | { |
170 | if (p_dev->config_index == 0) | 170 | if (p_dev->config_index == 0) |
@@ -173,14 +173,14 @@ static int dio700_pcmcia_config_loop(struct pcmcia_device *p_dev, | |||
173 | return pcmcia_request_io(p_dev); | 173 | return pcmcia_request_io(p_dev); |
174 | } | 174 | } |
175 | 175 | ||
176 | static int dio700_cs_attach(struct pcmcia_device *link) | 176 | static int daq700_cs_attach(struct pcmcia_device *link) |
177 | { | 177 | { |
178 | int ret; | 178 | int ret; |
179 | 179 | ||
180 | link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_AUDIO | | 180 | link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_AUDIO | |
181 | CONF_AUTO_SET_IO; | 181 | CONF_AUTO_SET_IO; |
182 | 182 | ||
183 | ret = pcmcia_loop_config(link, dio700_pcmcia_config_loop, NULL); | 183 | ret = pcmcia_loop_config(link, daq700_pcmcia_config_loop, NULL); |
184 | if (ret) | 184 | if (ret) |
185 | goto failed; | 185 | goto failed; |
186 | 186 | ||
@@ -199,50 +199,50 @@ failed: | |||
199 | return ret; | 199 | return ret; |
200 | } | 200 | } |
201 | 201 | ||
202 | static void dio700_cs_detach(struct pcmcia_device *link) | 202 | static void daq700_cs_detach(struct pcmcia_device *link) |
203 | { | 203 | { |
204 | pcmcia_disable_device(link); | 204 | pcmcia_disable_device(link); |
205 | pcmcia_cur_dev = NULL; | 205 | pcmcia_cur_dev = NULL; |
206 | } | 206 | } |
207 | 207 | ||
208 | static const struct pcmcia_device_id dio700_cs_ids[] = { | 208 | static const struct pcmcia_device_id daq700_cs_ids[] = { |
209 | PCMCIA_DEVICE_MANF_CARD(0x010b, 0x4743), | 209 | PCMCIA_DEVICE_MANF_CARD(0x010b, 0x4743), |
210 | PCMCIA_DEVICE_NULL | 210 | PCMCIA_DEVICE_NULL |
211 | }; | 211 | }; |
212 | MODULE_DEVICE_TABLE(pcmcia, dio700_cs_ids); | 212 | MODULE_DEVICE_TABLE(pcmcia, daq700_cs_ids); |
213 | 213 | ||
214 | static struct pcmcia_driver dio700_cs_driver = { | 214 | static struct pcmcia_driver daq700_cs_driver = { |
215 | .name = "ni_daq_700", | 215 | .name = "ni_daq_700", |
216 | .owner = THIS_MODULE, | 216 | .owner = THIS_MODULE, |
217 | .probe = dio700_cs_attach, | 217 | .probe = daq700_cs_attach, |
218 | .remove = dio700_cs_detach, | 218 | .remove = daq700_cs_detach, |
219 | .id_table = dio700_cs_ids, | 219 | .id_table = daq700_cs_ids, |
220 | }; | 220 | }; |
221 | 221 | ||
222 | static int __init dio700_cs_init(void) | 222 | static int __init daq700_cs_init(void) |
223 | { | 223 | { |
224 | int ret; | 224 | int ret; |
225 | 225 | ||
226 | ret = comedi_driver_register(&driver_dio700); | 226 | ret = comedi_driver_register(&daq700_driver); |
227 | if (ret < 0) | 227 | if (ret < 0) |
228 | return ret; | 228 | return ret; |
229 | 229 | ||
230 | ret = pcmcia_register_driver(&dio700_cs_driver); | 230 | ret = pcmcia_register_driver(&daq700_cs_driver); |
231 | if (ret < 0) { | 231 | if (ret < 0) { |
232 | comedi_driver_unregister(&driver_dio700); | 232 | comedi_driver_unregister(&daq700_driver); |
233 | return ret; | 233 | return ret; |
234 | } | 234 | } |
235 | 235 | ||
236 | return 0; | 236 | return 0; |
237 | } | 237 | } |
238 | module_init(dio700_cs_init); | 238 | module_init(daq700_cs_init); |
239 | 239 | ||
240 | static void __exit dio700_cs_exit(void) | 240 | static void __exit daq700_cs_exit(void) |
241 | { | 241 | { |
242 | pcmcia_unregister_driver(&dio700_cs_driver); | 242 | pcmcia_unregister_driver(&daq700_cs_driver); |
243 | comedi_driver_unregister(&driver_dio700); | 243 | comedi_driver_unregister(&daq700_driver); |
244 | } | 244 | } |
245 | module_exit(dio700_cs_exit); | 245 | module_exit(daq700_cs_exit); |
246 | 246 | ||
247 | MODULE_AUTHOR("Fred Brooks <nsaspook@nsaspook.com>"); | 247 | MODULE_AUTHOR("Fred Brooks <nsaspook@nsaspook.com>"); |
248 | MODULE_DESCRIPTION( | 248 | MODULE_DESCRIPTION( |