Skip to content

Commit

Permalink
isdn: rename capi_ctr_reseted() to capi_ctr_down()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tilman Schmidt authored and David S. Miller committed Jun 8, 2009
1 parent f0a4d0e commit 4e32997
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Documentation/isdn/INTERFACE.CAPI
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ From then on, Kernel CAPI may call the registered callback functions for the
device.

If the device becomes unusable for any reason (shutdown, disconnect ...), the
driver has to call capi_ctr_reseted(). This will prevent further calls to the
driver has to call capi_ctr_down(). This will prevent further calls to the
callback functions by Kernel CAPI.


Expand Down Expand Up @@ -166,7 +166,7 @@ int detach_capi_ctr(struct capi_ctr *ctrlr)
register/unregister a device (controller) with Kernel CAPI

void capi_ctr_ready(struct capi_ctr *ctrlr)
void capi_ctr_reseted(struct capi_ctr *ctrlr)
void capi_ctr_down(struct capi_ctr *ctrlr)
signal controller ready/not ready

void capi_ctr_suspend_output(struct capi_ctr *ctrlr)
Expand Down
8 changes: 4 additions & 4 deletions drivers/isdn/capi/kcapi.c
Original file line number Diff line number Diff line change
Expand Up @@ -377,14 +377,14 @@ void capi_ctr_ready(struct capi_ctr * card)
EXPORT_SYMBOL(capi_ctr_ready);

/**
* capi_ctr_reseted() - signal CAPI controller reset
* capi_ctr_down() - signal CAPI controller not ready
* @card: controller descriptor structure.
*
* Called by hardware driver to signal that the controller is down and
* unavailable for use.
*/

void capi_ctr_reseted(struct capi_ctr * card)
void capi_ctr_down(struct capi_ctr * card)
{
u16 appl;

Expand Down Expand Up @@ -413,7 +413,7 @@ void capi_ctr_reseted(struct capi_ctr * card)
notify_push(KCI_CONTRDOWN, card->cnr, 0, 0);
}

EXPORT_SYMBOL(capi_ctr_reseted);
EXPORT_SYMBOL(capi_ctr_down);

/**
* capi_ctr_suspend_output() - suspend controller
Expand Down Expand Up @@ -517,7 +517,7 @@ EXPORT_SYMBOL(attach_capi_ctr);
int detach_capi_ctr(struct capi_ctr *card)
{
if (card->cardstate != CARD_DETECTED)
capi_ctr_reseted(card);
capi_ctr_down(card);

ncards--;

Expand Down
2 changes: 1 addition & 1 deletion drivers/isdn/hardware/avm/b1.c
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ void b1_reset_ctr(struct capi_ctr *ctrl)
spin_lock_irqsave(&card->lock, flags);
capilib_release(&cinfo->ncci_head);
spin_unlock_irqrestore(&card->lock, flags);
capi_ctr_reseted(ctrl);
capi_ctr_down(ctrl);
}

void b1_register_appl(struct capi_ctr *ctrl,
Expand Down
2 changes: 1 addition & 1 deletion drivers/isdn/hardware/avm/b1dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ void b1dma_reset_ctr(struct capi_ctr *ctrl)
memset(cinfo->version, 0, sizeof(cinfo->version));
capilib_release(&cinfo->ncci_head);
spin_unlock_irqrestore(&card->lock, flags);
capi_ctr_reseted(ctrl);
capi_ctr_down(ctrl);
}

/* ------------------------------------------------------------- */
Expand Down
4 changes: 2 additions & 2 deletions drivers/isdn/hardware/avm/c4.c
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ static irqreturn_t c4_handle_interrupt(avmcard *card)
spin_lock_irqsave(&card->lock, flags);
capilib_release(&cinfo->ncci_head);
spin_unlock_irqrestore(&card->lock, flags);
capi_ctr_reseted(&cinfo->capi_ctrl);
capi_ctr_down(&cinfo->capi_ctrl);
}
card->nlogcontr = 0;
return IRQ_HANDLED;
Expand Down Expand Up @@ -909,7 +909,7 @@ static void c4_reset_ctr(struct capi_ctr *ctrl)
for (i=0; i < card->nr_controllers; i++) {
cinfo = &card->ctrlinfo[i];
memset(cinfo->version, 0, sizeof(cinfo->version));
capi_ctr_reseted(&cinfo->capi_ctrl);
capi_ctr_down(&cinfo->capi_ctrl);
}
card->nlogcontr = 0;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/isdn/hardware/avm/t1isa.c
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ static void t1isa_reset_ctr(struct capi_ctr *ctrl)
spin_lock_irqsave(&card->lock, flags);
capilib_release(&cinfo->ncci_head);
spin_unlock_irqrestore(&card->lock, flags);
capi_ctr_reseted(ctrl);
capi_ctr_down(ctrl);
}

static void t1isa_remove(struct pci_dev *pdev)
Expand Down
4 changes: 2 additions & 2 deletions drivers/isdn/hysdn/hycapi.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ hycapi_reset_ctr(struct capi_ctr *ctrl)
printk(KERN_NOTICE "HYCAPI hycapi_reset_ctr\n");
#endif
capilib_release(&cinfo->ncci_head);
capi_ctr_reseted(ctrl);
capi_ctr_down(ctrl);
}

/******************************
Expand Down Expand Up @@ -347,7 +347,7 @@ int hycapi_capi_stop(hysdn_card *card)
if(cinfo) {
ctrl = &cinfo->capi_ctrl;
/* ctrl->suspend_output(ctrl); */
capi_ctr_reseted(ctrl);
capi_ctr_down(ctrl);
}
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion include/linux/isdn/capilli.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ int attach_capi_ctr(struct capi_ctr *);
int detach_capi_ctr(struct capi_ctr *);

void capi_ctr_ready(struct capi_ctr * card);
void capi_ctr_reseted(struct capi_ctr * card);
void capi_ctr_down(struct capi_ctr * card);
void capi_ctr_suspend_output(struct capi_ctr * card);
void capi_ctr_resume_output(struct capi_ctr * card);
void capi_ctr_handle_message(struct capi_ctr * card, u16 appl, struct sk_buff *skb);
Expand Down
2 changes: 1 addition & 1 deletion net/bluetooth/cmtp/capi.c
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ static void cmtp_reset_ctr(struct capi_ctr *ctrl)

BT_DBG("ctrl %p", ctrl);

capi_ctr_reseted(ctrl);
capi_ctr_down(ctrl);

atomic_inc(&session->terminate);
cmtp_schedule(session);
Expand Down

0 comments on commit 4e32997

Please sign in to comment.