Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Tilman Schmidt and committed by
David S. Miller
4e329972 f0a4d0e5

+15 -15
+2 -2
Documentation/isdn/INTERFACE.CAPI
··· 45 45 device. 46 46 47 47 If the device becomes unusable for any reason (shutdown, disconnect ...), the 48 - driver has to call capi_ctr_reseted(). This will prevent further calls to the 48 + driver has to call capi_ctr_down(). This will prevent further calls to the 49 49 callback functions by Kernel CAPI. 50 50 51 51 ··· 166 166 register/unregister a device (controller) with Kernel CAPI 167 167 168 168 void capi_ctr_ready(struct capi_ctr *ctrlr) 169 - void capi_ctr_reseted(struct capi_ctr *ctrlr) 169 + void capi_ctr_down(struct capi_ctr *ctrlr) 170 170 signal controller ready/not ready 171 171 172 172 void capi_ctr_suspend_output(struct capi_ctr *ctrlr)
+4 -4
drivers/isdn/capi/kcapi.c
··· 377 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 381 * @card: controller descriptor structure. 382 382 * 383 383 * Called by hardware driver to signal that the controller is down and 384 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 389 u16 appl; 390 390 ··· 413 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 419 * capi_ctr_suspend_output() - suspend controller ··· 517 517 int detach_capi_ctr(struct capi_ctr *card) 518 518 { 519 519 if (card->cardstate != CARD_DETECTED) 520 - capi_ctr_reseted(card); 520 + capi_ctr_down(card); 521 521 522 522 ncards--; 523 523
+1 -1
drivers/isdn/hardware/avm/b1.c
··· 330 330 spin_lock_irqsave(&card->lock, flags); 331 331 capilib_release(&cinfo->ncci_head); 332 332 spin_unlock_irqrestore(&card->lock, flags); 333 - capi_ctr_reseted(ctrl); 333 + capi_ctr_down(ctrl); 334 334 } 335 335 336 336 void b1_register_appl(struct capi_ctr *ctrl,
+1 -1
drivers/isdn/hardware/avm/b1dma.c
··· 759 759 memset(cinfo->version, 0, sizeof(cinfo->version)); 760 760 capilib_release(&cinfo->ncci_head); 761 761 spin_unlock_irqrestore(&card->lock, flags); 762 - capi_ctr_reseted(ctrl); 762 + capi_ctr_down(ctrl); 763 763 } 764 764 765 765 /* ------------------------------------------------------------- */
+2 -2
drivers/isdn/hardware/avm/c4.c
··· 681 681 spin_lock_irqsave(&card->lock, flags); 682 682 capilib_release(&cinfo->ncci_head); 683 683 spin_unlock_irqrestore(&card->lock, flags); 684 - capi_ctr_reseted(&cinfo->capi_ctrl); 684 + capi_ctr_down(&cinfo->capi_ctrl); 685 685 } 686 686 card->nlogcontr = 0; 687 687 return IRQ_HANDLED; ··· 909 909 for (i=0; i < card->nr_controllers; i++) { 910 910 cinfo = &card->ctrlinfo[i]; 911 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 914 card->nlogcontr = 0; 915 915 }
+1 -1
drivers/isdn/hardware/avm/t1isa.c
··· 339 339 spin_lock_irqsave(&card->lock, flags); 340 340 capilib_release(&cinfo->ncci_head); 341 341 spin_unlock_irqrestore(&card->lock, flags); 342 - capi_ctr_reseted(ctrl); 342 + capi_ctr_down(ctrl); 343 343 } 344 344 345 345 static void t1isa_remove(struct pci_dev *pdev)
+2 -2
drivers/isdn/hysdn/hycapi.c
··· 67 67 printk(KERN_NOTICE "HYCAPI hycapi_reset_ctr\n"); 68 68 #endif 69 69 capilib_release(&cinfo->ncci_head); 70 - capi_ctr_reseted(ctrl); 70 + capi_ctr_down(ctrl); 71 71 } 72 72 73 73 /****************************** ··· 347 347 if(cinfo) { 348 348 ctrl = &cinfo->capi_ctrl; 349 349 /* ctrl->suspend_output(ctrl); */ 350 - capi_ctr_reseted(ctrl); 350 + capi_ctr_down(ctrl); 351 351 } 352 352 return 0; 353 353 }
+1 -1
include/linux/isdn/capilli.h
··· 79 79 int detach_capi_ctr(struct capi_ctr *); 80 80 81 81 void capi_ctr_ready(struct capi_ctr * card); 82 - void capi_ctr_reseted(struct capi_ctr * card); 82 + void capi_ctr_down(struct capi_ctr * card); 83 83 void capi_ctr_suspend_output(struct capi_ctr * card); 84 84 void capi_ctr_resume_output(struct capi_ctr * card); 85 85 void capi_ctr_handle_message(struct capi_ctr * card, u16 appl, struct sk_buff *skb);
+1 -1
net/bluetooth/cmtp/capi.c
··· 382 382 383 383 BT_DBG("ctrl %p", ctrl); 384 384 385 - capi_ctr_reseted(ctrl); 385 + capi_ctr_down(ctrl); 386 386 387 387 atomic_inc(&session->terminate); 388 388 cmtp_schedule(session);