irda: replace __FUNCTION__ with __func__
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
1fa98174ba
commit
a97a6f1077
@@ -152,12 +152,12 @@ static int __init via_ircc_init(void)
|
||||
{
|
||||
int rc;
|
||||
|
||||
IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
|
||||
IRDA_DEBUG(3, "%s()\n", __func__);
|
||||
|
||||
rc = pci_register_driver(&via_driver);
|
||||
if (rc < 0) {
|
||||
IRDA_DEBUG(0, "%s(): error rc = %d, returning -ENODEV...\n",
|
||||
__FUNCTION__, rc);
|
||||
__func__, rc);
|
||||
return -ENODEV;
|
||||
}
|
||||
return 0;
|
||||
@@ -170,11 +170,11 @@ static int __devinit via_init_one (struct pci_dev *pcidev, const struct pci_devi
|
||||
u16 Chipset,FirDRQ1,FirDRQ0,FirIRQ,FirIOBase;
|
||||
chipio_t info;
|
||||
|
||||
IRDA_DEBUG(2, "%s(): Device ID=(0X%X)\n", __FUNCTION__, id->device);
|
||||
IRDA_DEBUG(2, "%s(): Device ID=(0X%X)\n", __func__, id->device);
|
||||
|
||||
rc = pci_enable_device (pcidev);
|
||||
if (rc) {
|
||||
IRDA_DEBUG(0, "%s(): error rc = %d\n", __FUNCTION__, rc);
|
||||
IRDA_DEBUG(0, "%s(): error rc = %d\n", __func__, rc);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
@@ -185,7 +185,7 @@ static int __devinit via_init_one (struct pci_dev *pcidev, const struct pci_devi
|
||||
Chipset=0x3076;
|
||||
|
||||
if (Chipset==0x3076) {
|
||||
IRDA_DEBUG(2, "%s(): Chipset = 3076\n", __FUNCTION__);
|
||||
IRDA_DEBUG(2, "%s(): Chipset = 3076\n", __func__);
|
||||
|
||||
WriteLPCReg(7,0x0c );
|
||||
temp=ReadLPCReg(0x30);//check if BIOS Enable Fir
|
||||
@@ -222,7 +222,7 @@ static int __devinit via_init_one (struct pci_dev *pcidev, const struct pci_devi
|
||||
} else
|
||||
rc = -ENODEV; //IR not turn on
|
||||
} else { //Not VT1211
|
||||
IRDA_DEBUG(2, "%s(): Chipset = 3096\n", __FUNCTION__);
|
||||
IRDA_DEBUG(2, "%s(): Chipset = 3096\n", __func__);
|
||||
|
||||
pci_read_config_byte(pcidev,0x67,&bTmp);//check if BIOS Enable Fir
|
||||
if((bTmp&0x01)==1) { // BIOS enable FIR
|
||||
@@ -262,7 +262,7 @@ static int __devinit via_init_one (struct pci_dev *pcidev, const struct pci_devi
|
||||
rc = -ENODEV; //IR not turn on !!!!!
|
||||
}//Not VT1211
|
||||
|
||||
IRDA_DEBUG(2, "%s(): End - rc = %d\n", __FUNCTION__, rc);
|
||||
IRDA_DEBUG(2, "%s(): End - rc = %d\n", __func__, rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
@@ -276,7 +276,7 @@ static void via_ircc_clean(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
|
||||
IRDA_DEBUG(3, "%s()\n", __func__);
|
||||
|
||||
for (i=0; i < ARRAY_SIZE(dev_self); i++) {
|
||||
if (dev_self[i])
|
||||
@@ -286,7 +286,7 @@ static void via_ircc_clean(void)
|
||||
|
||||
static void __devexit via_remove_one (struct pci_dev *pdev)
|
||||
{
|
||||
IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
|
||||
IRDA_DEBUG(3, "%s()\n", __func__);
|
||||
|
||||
/* FIXME : This is ugly. We should use pci_get_drvdata(pdev);
|
||||
* to get our driver instance and call directly via_ircc_close().
|
||||
@@ -301,7 +301,7 @@ static void __devexit via_remove_one (struct pci_dev *pdev)
|
||||
|
||||
static void __exit via_ircc_cleanup(void)
|
||||
{
|
||||
IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
|
||||
IRDA_DEBUG(3, "%s()\n", __func__);
|
||||
|
||||
/* FIXME : This should be redundant, as pci_unregister_driver()
|
||||
* should call via_remove_one() on each device.
|
||||
@@ -324,7 +324,7 @@ static __devinit int via_ircc_open(int i, chipio_t * info, unsigned int id)
|
||||
struct via_ircc_cb *self;
|
||||
int err;
|
||||
|
||||
IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
|
||||
IRDA_DEBUG(3, "%s()\n", __func__);
|
||||
|
||||
if (i >= ARRAY_SIZE(dev_self))
|
||||
return -ENOMEM;
|
||||
@@ -360,7 +360,7 @@ static __devinit int via_ircc_open(int i, chipio_t * info, unsigned int id)
|
||||
/* Reserve the ioports that we need */
|
||||
if (!request_region(self->io.fir_base, self->io.fir_ext, driver_name)) {
|
||||
IRDA_DEBUG(0, "%s(), can't get iobase of 0x%03x\n",
|
||||
__FUNCTION__, self->io.fir_base);
|
||||
__func__, self->io.fir_base);
|
||||
err = -ENODEV;
|
||||
goto err_out1;
|
||||
}
|
||||
@@ -471,7 +471,7 @@ static int via_ircc_close(struct via_ircc_cb *self)
|
||||
{
|
||||
int iobase;
|
||||
|
||||
IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
|
||||
IRDA_DEBUG(3, "%s()\n", __func__);
|
||||
|
||||
IRDA_ASSERT(self != NULL, return -1;);
|
||||
|
||||
@@ -483,7 +483,7 @@ static int via_ircc_close(struct via_ircc_cb *self)
|
||||
|
||||
/* Release the PORT that this driver is using */
|
||||
IRDA_DEBUG(2, "%s(), Releasing Region %03x\n",
|
||||
__FUNCTION__, self->io.fir_base);
|
||||
__func__, self->io.fir_base);
|
||||
release_region(self->io.fir_base, self->io.fir_ext);
|
||||
if (self->tx_buff.head)
|
||||
dma_free_coherent(NULL, self->tx_buff.truesize,
|
||||
@@ -509,7 +509,7 @@ static void via_hw_init(struct via_ircc_cb *self)
|
||||
{
|
||||
int iobase = self->io.fir_base;
|
||||
|
||||
IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
|
||||
IRDA_DEBUG(3, "%s()\n", __func__);
|
||||
|
||||
SetMaxRxPacketSize(iobase, 0x0fff); //set to max:4095
|
||||
// FIFO Init
|
||||
@@ -582,7 +582,7 @@ static void via_ircc_change_dongle_speed(int iobase, int speed,
|
||||
speed = speed;
|
||||
|
||||
IRDA_DEBUG(1, "%s(): change_dongle_speed to %d for 0x%x, %d\n",
|
||||
__FUNCTION__, speed, iobase, dongle_id);
|
||||
__func__, speed, iobase, dongle_id);
|
||||
|
||||
switch (dongle_id) {
|
||||
|
||||
@@ -671,7 +671,7 @@ static void via_ircc_change_dongle_speed(int iobase, int speed,
|
||||
|
||||
case 0x11: /* Temic TFDS4500 */
|
||||
|
||||
IRDA_DEBUG(2, "%s: Temic TFDS4500: One RX pin, TX normal, RX inverted.\n", __FUNCTION__);
|
||||
IRDA_DEBUG(2, "%s: Temic TFDS4500: One RX pin, TX normal, RX inverted.\n", __func__);
|
||||
|
||||
UseOneRX(iobase, ON); //use ONE RX....RX1
|
||||
InvertTX(iobase, OFF);
|
||||
@@ -689,7 +689,7 @@ static void via_ircc_change_dongle_speed(int iobase, int speed,
|
||||
SlowIRRXLowActive(iobase, OFF);
|
||||
|
||||
} else{
|
||||
IRDA_DEBUG(0, "%s: Warning: TFDS4500 not running in SIR mode !\n", __FUNCTION__);
|
||||
IRDA_DEBUG(0, "%s: Warning: TFDS4500 not running in SIR mode !\n", __func__);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -707,7 +707,7 @@ static void via_ircc_change_dongle_speed(int iobase, int speed,
|
||||
|
||||
default:
|
||||
IRDA_ERROR("%s: Error: dongle_id %d unsupported !\n",
|
||||
__FUNCTION__, dongle_id);
|
||||
__func__, dongle_id);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -726,7 +726,7 @@ static void via_ircc_change_speed(struct via_ircc_cb *self, __u32 speed)
|
||||
iobase = self->io.fir_base;
|
||||
/* Update accounting for new speed */
|
||||
self->io.speed = speed;
|
||||
IRDA_DEBUG(1, "%s: change_speed to %d bps.\n", __FUNCTION__, speed);
|
||||
IRDA_DEBUG(1, "%s: change_speed to %d bps.\n", __func__, speed);
|
||||
|
||||
WriteReg(iobase, I_ST_CT_0, 0x0);
|
||||
|
||||
@@ -957,7 +957,7 @@ static int via_ircc_dma_xmit(struct via_ircc_cb *self, u16 iobase)
|
||||
self->tx_buff.head) + self->tx_buff_dma,
|
||||
self->tx_fifo.queue[self->tx_fifo.ptr].len, DMA_TX_MODE);
|
||||
IRDA_DEBUG(1, "%s: tx_fifo.ptr=%x,len=%x,tx_fifo.len=%x..\n",
|
||||
__FUNCTION__, self->tx_fifo.ptr,
|
||||
__func__, self->tx_fifo.ptr,
|
||||
self->tx_fifo.queue[self->tx_fifo.ptr].len,
|
||||
self->tx_fifo.len);
|
||||
|
||||
@@ -981,7 +981,7 @@ static int via_ircc_dma_xmit_complete(struct via_ircc_cb *self)
|
||||
int ret = TRUE;
|
||||
u8 Tx_status;
|
||||
|
||||
IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
|
||||
IRDA_DEBUG(3, "%s()\n", __func__);
|
||||
|
||||
iobase = self->io.fir_base;
|
||||
/* Disable DMA */
|
||||
@@ -1014,7 +1014,7 @@ static int via_ircc_dma_xmit_complete(struct via_ircc_cb *self)
|
||||
}
|
||||
IRDA_DEBUG(1,
|
||||
"%s: tx_fifo.len=%x ,tx_fifo.ptr=%x,tx_fifo.free=%x...\n",
|
||||
__FUNCTION__,
|
||||
__func__,
|
||||
self->tx_fifo.len, self->tx_fifo.ptr, self->tx_fifo.free);
|
||||
/* F01_S
|
||||
// Any frames to be sent back-to-back?
|
||||
@@ -1050,7 +1050,7 @@ static int via_ircc_dma_receive(struct via_ircc_cb *self)
|
||||
|
||||
iobase = self->io.fir_base;
|
||||
|
||||
IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
|
||||
IRDA_DEBUG(3, "%s()\n", __func__);
|
||||
|
||||
self->tx_fifo.len = self->tx_fifo.ptr = self->tx_fifo.free = 0;
|
||||
self->tx_fifo.tail = self->tx_buff.head;
|
||||
@@ -1134,13 +1134,13 @@ static int via_ircc_dma_receive_complete(struct via_ircc_cb *self,
|
||||
return TRUE; //interrupt only, data maybe move by RxT
|
||||
if (((len - 4) < 2) || ((len - 4) > 2048)) {
|
||||
IRDA_DEBUG(1, "%s(): Trouble:len=%x,CurCount=%x,LastCount=%x..\n",
|
||||
__FUNCTION__, len, RxCurCount(iobase, self),
|
||||
__func__, len, RxCurCount(iobase, self),
|
||||
self->RxLastCount);
|
||||
hwreset(self);
|
||||
return FALSE;
|
||||
}
|
||||
IRDA_DEBUG(2, "%s(): fifo.len=%x,len=%x,CurCount=%x..\n",
|
||||
__FUNCTION__,
|
||||
__func__,
|
||||
st_fifo->len, len - 4, RxCurCount(iobase, self));
|
||||
|
||||
st_fifo->entries[st_fifo->tail].status = status;
|
||||
@@ -1187,7 +1187,7 @@ F01_E */
|
||||
skb_put(skb, len - 4);
|
||||
|
||||
skb_copy_to_linear_data(skb, self->rx_buff.data, len - 4);
|
||||
IRDA_DEBUG(2, "%s(): len=%x.rx_buff=%p\n", __FUNCTION__,
|
||||
IRDA_DEBUG(2, "%s(): len=%x.rx_buff=%p\n", __func__,
|
||||
len - 4, self->rx_buff.data);
|
||||
|
||||
// Move to next frame
|
||||
@@ -1217,7 +1217,7 @@ static int upload_rxdata(struct via_ircc_cb *self, int iobase)
|
||||
|
||||
len = GetRecvByte(iobase, self);
|
||||
|
||||
IRDA_DEBUG(2, "%s(): len=%x\n", __FUNCTION__, len);
|
||||
IRDA_DEBUG(2, "%s(): len=%x\n", __func__, len);
|
||||
|
||||
if ((len - 4) < 2) {
|
||||
self->stats.rx_dropped++;
|
||||
@@ -1302,7 +1302,7 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase)
|
||||
skb_put(skb, len - 4);
|
||||
skb_copy_to_linear_data(skb, self->rx_buff.data, len - 4);
|
||||
|
||||
IRDA_DEBUG(2, "%s(): len=%x.head=%x\n", __FUNCTION__,
|
||||
IRDA_DEBUG(2, "%s(): len=%x.head=%x\n", __func__,
|
||||
len - 4, st_fifo->head);
|
||||
|
||||
// Move to next frame
|
||||
@@ -1318,7 +1318,7 @@ static int RxTimerHandler(struct via_ircc_cb *self, int iobase)
|
||||
|
||||
IRDA_DEBUG(2,
|
||||
"%s(): End of upload HostStatus=%x,RxStatus=%x\n",
|
||||
__FUNCTION__,
|
||||
__func__,
|
||||
GetHostStatus(iobase), GetRXStatus(iobase));
|
||||
|
||||
/*
|
||||
@@ -1358,7 +1358,7 @@ static irqreturn_t via_ircc_interrupt(int dummy, void *dev_id)
|
||||
iHostIntType = GetHostStatus(iobase);
|
||||
|
||||
IRDA_DEBUG(4, "%s(): iHostIntType %02x: %s %s %s %02x\n",
|
||||
__FUNCTION__, iHostIntType,
|
||||
__func__, iHostIntType,
|
||||
(iHostIntType & 0x40) ? "Timer" : "",
|
||||
(iHostIntType & 0x20) ? "Tx" : "",
|
||||
(iHostIntType & 0x10) ? "Rx" : "",
|
||||
@@ -1388,7 +1388,7 @@ static irqreturn_t via_ircc_interrupt(int dummy, void *dev_id)
|
||||
iTxIntType = GetTXStatus(iobase);
|
||||
|
||||
IRDA_DEBUG(4, "%s(): iTxIntType %02x: %s %s %s %s\n",
|
||||
__FUNCTION__, iTxIntType,
|
||||
__func__, iTxIntType,
|
||||
(iTxIntType & 0x08) ? "FIFO underr." : "",
|
||||
(iTxIntType & 0x04) ? "EOM" : "",
|
||||
(iTxIntType & 0x02) ? "FIFO ready" : "",
|
||||
@@ -1412,7 +1412,7 @@ static irqreturn_t via_ircc_interrupt(int dummy, void *dev_id)
|
||||
iRxIntType = GetRXStatus(iobase);
|
||||
|
||||
IRDA_DEBUG(4, "%s(): iRxIntType %02x: %s %s %s %s %s %s %s\n",
|
||||
__FUNCTION__, iRxIntType,
|
||||
__func__, iRxIntType,
|
||||
(iRxIntType & 0x80) ? "PHY err." : "",
|
||||
(iRxIntType & 0x40) ? "CRC err" : "",
|
||||
(iRxIntType & 0x20) ? "FIFO overr." : "",
|
||||
@@ -1421,7 +1421,7 @@ static irqreturn_t via_ircc_interrupt(int dummy, void *dev_id)
|
||||
(iRxIntType & 0x02) ? "RxMaxLen" : "",
|
||||
(iRxIntType & 0x01) ? "SIR bad" : "");
|
||||
if (!iRxIntType)
|
||||
IRDA_DEBUG(3, "%s(): RxIRQ =0\n", __FUNCTION__);
|
||||
IRDA_DEBUG(3, "%s(): RxIRQ =0\n", __func__);
|
||||
|
||||
if (iRxIntType & 0x10) {
|
||||
if (via_ircc_dma_receive_complete(self, iobase)) {
|
||||
@@ -1431,7 +1431,7 @@ static irqreturn_t via_ircc_interrupt(int dummy, void *dev_id)
|
||||
} // No ERR
|
||||
else { //ERR
|
||||
IRDA_DEBUG(4, "%s(): RxIRQ ERR:iRxIntType=%x,HostIntType=%x,CurCount=%x,RxLastCount=%x_____\n",
|
||||
__FUNCTION__, iRxIntType, iHostIntType,
|
||||
__func__, iRxIntType, iHostIntType,
|
||||
RxCurCount(iobase, self),
|
||||
self->RxLastCount);
|
||||
|
||||
@@ -1456,7 +1456,7 @@ static void hwreset(struct via_ircc_cb *self)
|
||||
int iobase;
|
||||
iobase = self->io.fir_base;
|
||||
|
||||
IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
|
||||
IRDA_DEBUG(3, "%s()\n", __func__);
|
||||
|
||||
ResetChip(iobase, 5);
|
||||
EnableDMA(iobase, OFF);
|
||||
@@ -1501,7 +1501,7 @@ static int via_ircc_is_receiving(struct via_ircc_cb *self)
|
||||
if (CkRxRecv(iobase, self))
|
||||
status = TRUE;
|
||||
|
||||
IRDA_DEBUG(2, "%s(): status=%x....\n", __FUNCTION__, status);
|
||||
IRDA_DEBUG(2, "%s(): status=%x....\n", __func__, status);
|
||||
|
||||
return status;
|
||||
}
|
||||
@@ -1519,7 +1519,7 @@ static int via_ircc_net_open(struct net_device *dev)
|
||||
int iobase;
|
||||
char hwname[32];
|
||||
|
||||
IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
|
||||
IRDA_DEBUG(3, "%s()\n", __func__);
|
||||
|
||||
IRDA_ASSERT(dev != NULL, return -1;);
|
||||
self = (struct via_ircc_cb *) dev->priv;
|
||||
@@ -1586,7 +1586,7 @@ static int via_ircc_net_close(struct net_device *dev)
|
||||
struct via_ircc_cb *self;
|
||||
int iobase;
|
||||
|
||||
IRDA_DEBUG(3, "%s()\n", __FUNCTION__);
|
||||
IRDA_DEBUG(3, "%s()\n", __func__);
|
||||
|
||||
IRDA_ASSERT(dev != NULL, return -1;);
|
||||
self = (struct via_ircc_cb *) dev->priv;
|
||||
@@ -1630,7 +1630,7 @@ static int via_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq,
|
||||
IRDA_ASSERT(dev != NULL, return -1;);
|
||||
self = dev->priv;
|
||||
IRDA_ASSERT(self != NULL, return -1;);
|
||||
IRDA_DEBUG(1, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__, dev->name,
|
||||
IRDA_DEBUG(1, "%s(), %s, (cmd=0x%X)\n", __func__, dev->name,
|
||||
cmd);
|
||||
/* Disable interrupts & save flags */
|
||||
spin_lock_irqsave(&self->lock, flags);
|
||||
|
Reference in New Issue
Block a user