diff options
author | Tilman Schmidt <tilman@imap.cc> | 2009-06-07 05:09:23 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-08 03:45:50 -0400 |
commit | 4e329972052c3649367b91de783f6293b8653cb2 (patch) | |
tree | f1da15bbb95353c2b5184e0ef42693112cd9322d /drivers/isdn | |
parent | f0a4d0e5b5bfd271e6737f7c095994835b70d450 (diff) |
isdn: rename capi_ctr_reseted() to capi_ctr_down()
Change the name of the Kernel CAPI exported function capi_ctr_reseted()
to something representing its purpose better.
Impact: renaming, no functional change
Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/capi/kcapi.c | 8 | ||||
-rw-r--r-- | drivers/isdn/hardware/avm/b1.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hardware/avm/b1dma.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hardware/avm/c4.c | 4 | ||||
-rw-r--r-- | drivers/isdn/hardware/avm/t1isa.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hysdn/hycapi.c | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c index f33170368cd1..57d26360f64e 100644 --- a/drivers/isdn/capi/kcapi.c +++ b/drivers/isdn/capi/kcapi.c | |||
@@ -377,14 +377,14 @@ void capi_ctr_ready(struct capi_ctr * card) | |||
377 | EXPORT_SYMBOL(capi_ctr_ready); | 377 | EXPORT_SYMBOL(capi_ctr_ready); |
378 | 378 | ||
379 | /** | 379 | /** |
380 | * capi_ctr_reseted() - signal CAPI controller reset | 380 | * capi_ctr_down() - signal CAPI controller not ready |
381 | * @card: controller descriptor structure. | 381 | * @card: controller descriptor structure. |
382 | * | 382 | * |
383 | * Called by hardware driver to signal that the controller is down and | 383 | * Called by hardware driver to signal that the controller is down and |
384 | * unavailable for use. | 384 | * unavailable for use. |
385 | */ | 385 | */ |
386 | 386 | ||
387 | void capi_ctr_reseted(struct capi_ctr * card) | 387 | void capi_ctr_down(struct capi_ctr * card) |
388 | { | 388 | { |
389 | u16 appl; | 389 | u16 appl; |
390 | 390 | ||
@@ -413,7 +413,7 @@ void capi_ctr_reseted(struct capi_ctr * card) | |||
413 | notify_push(KCI_CONTRDOWN, card->cnr, 0, 0); | 413 | notify_push(KCI_CONTRDOWN, card->cnr, 0, 0); |
414 | } | 414 | } |
415 | 415 | ||
416 | EXPORT_SYMBOL(capi_ctr_reseted); | 416 | EXPORT_SYMBOL(capi_ctr_down); |
417 | 417 | ||
418 | /** | 418 | /** |
419 | * capi_ctr_suspend_output() - suspend controller | 419 | * capi_ctr_suspend_output() - suspend controller |
@@ -517,7 +517,7 @@ EXPORT_SYMBOL(attach_capi_ctr); | |||
517 | int detach_capi_ctr(struct capi_ctr *card) | 517 | int detach_capi_ctr(struct capi_ctr *card) |
518 | { | 518 | { |
519 | if (card->cardstate != CARD_DETECTED) | 519 | if (card->cardstate != CARD_DETECTED) |
520 | capi_ctr_reseted(card); | 520 | capi_ctr_down(card); |
521 | 521 | ||
522 | ncards--; | 522 | ncards--; |
523 | 523 | ||
diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c index abf05ec31760..a7c0083e78a7 100644 --- a/drivers/isdn/hardware/avm/b1.c +++ b/drivers/isdn/hardware/avm/b1.c | |||
@@ -330,7 +330,7 @@ void b1_reset_ctr(struct capi_ctr *ctrl) | |||
330 | spin_lock_irqsave(&card->lock, flags); | 330 | spin_lock_irqsave(&card->lock, flags); |
331 | capilib_release(&cinfo->ncci_head); | 331 | capilib_release(&cinfo->ncci_head); |
332 | spin_unlock_irqrestore(&card->lock, flags); | 332 | spin_unlock_irqrestore(&card->lock, flags); |
333 | capi_ctr_reseted(ctrl); | 333 | capi_ctr_down(ctrl); |
334 | } | 334 | } |
335 | 335 | ||
336 | void b1_register_appl(struct capi_ctr *ctrl, | 336 | void b1_register_appl(struct capi_ctr *ctrl, |
diff --git a/drivers/isdn/hardware/avm/b1dma.c b/drivers/isdn/hardware/avm/b1dma.c index da34b98e3de7..0e84aaae43fd 100644 --- a/drivers/isdn/hardware/avm/b1dma.c +++ b/drivers/isdn/hardware/avm/b1dma.c | |||
@@ -759,7 +759,7 @@ void b1dma_reset_ctr(struct capi_ctr *ctrl) | |||
759 | memset(cinfo->version, 0, sizeof(cinfo->version)); | 759 | memset(cinfo->version, 0, sizeof(cinfo->version)); |
760 | capilib_release(&cinfo->ncci_head); | 760 | capilib_release(&cinfo->ncci_head); |
761 | spin_unlock_irqrestore(&card->lock, flags); | 761 | spin_unlock_irqrestore(&card->lock, flags); |
762 | capi_ctr_reseted(ctrl); | 762 | capi_ctr_down(ctrl); |
763 | } | 763 | } |
764 | 764 | ||
765 | /* ------------------------------------------------------------- */ | 765 | /* ------------------------------------------------------------- */ |
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c index 9df1d3f66c87..6833301a45fc 100644 --- a/drivers/isdn/hardware/avm/c4.c +++ b/drivers/isdn/hardware/avm/c4.c | |||
@@ -681,7 +681,7 @@ static irqreturn_t c4_handle_interrupt(avmcard *card) | |||
681 | spin_lock_irqsave(&card->lock, flags); | 681 | spin_lock_irqsave(&card->lock, flags); |
682 | capilib_release(&cinfo->ncci_head); | 682 | capilib_release(&cinfo->ncci_head); |
683 | spin_unlock_irqrestore(&card->lock, flags); | 683 | spin_unlock_irqrestore(&card->lock, flags); |
684 | capi_ctr_reseted(&cinfo->capi_ctrl); | 684 | capi_ctr_down(&cinfo->capi_ctrl); |
685 | } | 685 | } |
686 | card->nlogcontr = 0; | 686 | card->nlogcontr = 0; |
687 | return IRQ_HANDLED; | 687 | return IRQ_HANDLED; |
@@ -909,7 +909,7 @@ static void c4_reset_ctr(struct capi_ctr *ctrl) | |||
909 | for (i=0; i < card->nr_controllers; i++) { | 909 | for (i=0; i < card->nr_controllers; i++) { |
910 | cinfo = &card->ctrlinfo[i]; | 910 | cinfo = &card->ctrlinfo[i]; |
911 | memset(cinfo->version, 0, sizeof(cinfo->version)); | 911 | memset(cinfo->version, 0, sizeof(cinfo->version)); |
912 | capi_ctr_reseted(&cinfo->capi_ctrl); | 912 | capi_ctr_down(&cinfo->capi_ctrl); |
913 | } | 913 | } |
914 | card->nlogcontr = 0; | 914 | card->nlogcontr = 0; |
915 | } | 915 | } |
diff --git a/drivers/isdn/hardware/avm/t1isa.c b/drivers/isdn/hardware/avm/t1isa.c index e7724493738c..1c53fd49adb6 100644 --- a/drivers/isdn/hardware/avm/t1isa.c +++ b/drivers/isdn/hardware/avm/t1isa.c | |||
@@ -339,7 +339,7 @@ static void t1isa_reset_ctr(struct capi_ctr *ctrl) | |||
339 | spin_lock_irqsave(&card->lock, flags); | 339 | spin_lock_irqsave(&card->lock, flags); |
340 | capilib_release(&cinfo->ncci_head); | 340 | capilib_release(&cinfo->ncci_head); |
341 | spin_unlock_irqrestore(&card->lock, flags); | 341 | spin_unlock_irqrestore(&card->lock, flags); |
342 | capi_ctr_reseted(ctrl); | 342 | capi_ctr_down(ctrl); |
343 | } | 343 | } |
344 | 344 | ||
345 | static void t1isa_remove(struct pci_dev *pdev) | 345 | static void t1isa_remove(struct pci_dev *pdev) |
diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c index 53f6ad1235db..4ffaa14b9fc4 100644 --- a/drivers/isdn/hysdn/hycapi.c +++ b/drivers/isdn/hysdn/hycapi.c | |||
@@ -67,7 +67,7 @@ hycapi_reset_ctr(struct capi_ctr *ctrl) | |||
67 | printk(KERN_NOTICE "HYCAPI hycapi_reset_ctr\n"); | 67 | printk(KERN_NOTICE "HYCAPI hycapi_reset_ctr\n"); |
68 | #endif | 68 | #endif |
69 | capilib_release(&cinfo->ncci_head); | 69 | capilib_release(&cinfo->ncci_head); |
70 | capi_ctr_reseted(ctrl); | 70 | capi_ctr_down(ctrl); |
71 | } | 71 | } |
72 | 72 | ||
73 | /****************************** | 73 | /****************************** |
@@ -347,7 +347,7 @@ int hycapi_capi_stop(hysdn_card *card) | |||
347 | if(cinfo) { | 347 | if(cinfo) { |
348 | ctrl = &cinfo->capi_ctrl; | 348 | ctrl = &cinfo->capi_ctrl; |
349 | /* ctrl->suspend_output(ctrl); */ | 349 | /* ctrl->suspend_output(ctrl); */ |
350 | capi_ctr_reseted(ctrl); | 350 | capi_ctr_down(ctrl); |
351 | } | 351 | } |
352 | return 0; | 352 | return 0; |
353 | } | 353 | } |