aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-06-22 19:16:41 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-22 23:55:05 -0400
commit59c9c00234fbadc8c479c89ec517e2e4f964029c (patch)
treeb8b04584739edac587b4c2e1e2376a418cd07c27 /drivers
parent2f485d93cb6f870f2f19fb9a18656a372583eab1 (diff)
staging: comedi: ni_daq_700: remove some useless comments
Remove some useless comments and whitespace. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/comedi/drivers/ni_daq_700.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c
index 30eeb9d1c842..1059297fd9fb 100644
--- a/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -111,8 +111,6 @@ static struct comedi_driver driver_dio700 = {
111 .offset = sizeof(struct dio700_board), 111 .offset = sizeof(struct dio700_board),
112}; 112};
113 113
114/* the real driver routines */
115
116#define _700_SIZE 8 114#define _700_SIZE 8
117 115
118#define _700_DATA 0 116#define _700_DATA 0
@@ -342,7 +340,7 @@ static int dio700_cs_attach(struct pcmcia_device *link)
342 dio700_config(link); 340 dio700_config(link);
343 341
344 return 0; 342 return 0;
345} /* dio700_cs_attach */ 343}
346 344
347static void dio700_cs_detach(struct pcmcia_device *link) 345static void dio700_cs_detach(struct pcmcia_device *link)
348{ 346{
@@ -392,14 +390,14 @@ failed:
392 printk(KERN_INFO "ni_daq_700 cs failed"); 390 printk(KERN_INFO "ni_daq_700 cs failed");
393 dio700_release(link); 391 dio700_release(link);
394 392
395} /* dio700_config */ 393}
396 394
397static void dio700_release(struct pcmcia_device *link) 395static void dio700_release(struct pcmcia_device *link)
398{ 396{
399 dev_dbg(&link->dev, "dio700_release\n"); 397 dev_dbg(&link->dev, "dio700_release\n");
400 398
401 pcmcia_disable_device(link); 399 pcmcia_disable_device(link);
402} /* dio700_release */ 400}
403 401
404static int dio700_cs_suspend(struct pcmcia_device *link) 402static int dio700_cs_suspend(struct pcmcia_device *link)
405{ 403{
@@ -408,7 +406,7 @@ static int dio700_cs_suspend(struct pcmcia_device *link)
408 /* Mark the device as stopped, to block IO until later */ 406 /* Mark the device as stopped, to block IO until later */
409 local->stop = 1; 407 local->stop = 1;
410 return 0; 408 return 0;
411} /* dio700_cs_suspend */ 409}
412 410
413static int dio700_cs_resume(struct pcmcia_device *link) 411static int dio700_cs_resume(struct pcmcia_device *link)
414{ 412{
@@ -416,17 +414,12 @@ static int dio700_cs_resume(struct pcmcia_device *link)
416 414
417 local->stop = 0; 415 local->stop = 0;
418 return 0; 416 return 0;
419} /* dio700_cs_resume */ 417}
420
421/*====================================================================*/
422 418
423static const struct pcmcia_device_id dio700_cs_ids[] = { 419static const struct pcmcia_device_id dio700_cs_ids[] = {
424 /* N.B. These IDs should match those in dio700_boards */ 420 PCMCIA_DEVICE_MANF_CARD(0x010b, 0x4743),
425 PCMCIA_DEVICE_MANF_CARD(0x010b, 0x4743), /* daqcard-700 */
426 PCMCIA_DEVICE_NULL 421 PCMCIA_DEVICE_NULL
427}; 422};
428
429
430MODULE_DEVICE_TABLE(pcmcia, dio700_cs_ids); 423MODULE_DEVICE_TABLE(pcmcia, dio700_cs_ids);
431 424
432static struct pcmcia_driver dio700_cs_driver = { 425static struct pcmcia_driver dio700_cs_driver = {