Skip to content

Commit

Permalink
staging: __FUNCTION__ is gcc-specific, use __func__
Browse files Browse the repository at this point in the history 
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Harvey Harrison authored and Linus Torvalds committed Jan 7, 2009
1 parent 9b4778f commit d599edc
Show file tree
Hide file tree
Showing 64 changed files with 360 additions and 360 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/comedi/drivers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ unsigned int comedi_buf_munge(comedi_async * async, unsigned int num_bytes)
block_size = num_bytes - count;
if (block_size < 0) {
rt_printk("%s: %s: bug! block_size is negative\n",
__FILE__, __FUNCTION__);
__FILE__, __func__);
break;
}
if ((int)(async->munge_ptr + block_size -
Expand Down
60 changes: 30 additions & 30 deletions drivers/staging/epl/Edrv8139.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,19 +391,19 @@ tEplKernel EdrvInit(tEdrvInitParam * pEdrvInitParam_p)
// register PCI driver
iResult = pci_register_driver(&EdrvDriver);
if (iResult != 0) {
printk("%s pci_register_driver failed with %d\n", __FUNCTION__,
printk("%s pci_register_driver failed with %d\n", __func__,
iResult);
Ret = kEplNoResource;
goto Exit;
}

if (EdrvInstance_l.m_pPciDev == NULL) {
printk("%s m_pPciDev=NULL\n", __FUNCTION__);
printk("%s m_pPciDev=NULL\n", __func__);
Ret = kEplNoResource;
goto Exit;
}
// read MAC address from controller
printk("%s local MAC = ", __FUNCTION__);
printk("%s local MAC = ", __func__);
for (iResult = 0; iResult < 6; iResult++) {
pEdrvInitParam_p->m_abMyMacAddr[iResult] =
EDRV_REGB_READ((EDRV_REGDW_IDR0 + iResult));
Expand Down Expand Up @@ -434,7 +434,7 @@ tEplKernel EdrvShutdown(void)
{

// unregister PCI driver
printk("%s calling pci_unregister_driver()\n", __FUNCTION__);
printk("%s calling pci_unregister_driver()\n", __func__);
pci_unregister_driver(&EdrvDriver);

return kEplSuccessful;
Expand Down Expand Up @@ -621,7 +621,7 @@ tEplKernel EdrvSendTxMsg(tEdrvTxBuffer * pBuffer_p)
EDRV_REGDW_READ((EDRV_REGDW_TSD0 +
(EdrvInstance_l.m_uiCurTxDesc *
sizeof(DWORD))));
printk("%s InvOp TSD%u = 0x%08lX", __FUNCTION__,
printk("%s InvOp TSD%u = 0x%08lX", __func__,
EdrvInstance_l.m_uiCurTxDesc, dwTemp);
printk(" Cmd = 0x%02X\n",
(WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND));
Expand All @@ -646,7 +646,7 @@ tEplKernel EdrvSendTxMsg(tEdrvTxBuffer * pBuffer_p)
dwTemp =
EDRV_REGDW_READ((EDRV_REGDW_TSAD0 +
(EdrvInstance_l.m_uiCurTxDesc * sizeof(DWORD))));
// printk("%s TSAD%u = 0x%08lX", __FUNCTION__, EdrvInstance_l.m_uiCurTxDesc, dwTemp);
// printk("%s TSAD%u = 0x%08lX", __func__, EdrvInstance_l.m_uiCurTxDesc, dwTemp);

// start transmission
EDRV_REGDW_WRITE((EDRV_REGDW_TSD0 +
Expand Down Expand Up @@ -786,7 +786,7 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p,

if (EdrvInstance_l.m_pbTxBuf == NULL) {
printk("%s Tx buffers currently not allocated\n",
__FUNCTION__);
__func__);
goto Exit;
}
// read transmit status
Expand Down Expand Up @@ -842,7 +842,7 @@ static int TgtEthIsr(int nIrqNum_p, void *ppDevInstData_p,

if (EdrvInstance_l.m_pbRxBuf == NULL) {
printk("%s Rx buffers currently not allocated\n",
__FUNCTION__);
__func__);
goto Exit;
}
// read current offset in receive buffer
Expand Down Expand Up @@ -944,7 +944,7 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
DWORD dwTemp;

if (EdrvInstance_l.m_pPciDev != NULL) { // Edrv is already connected to a PCI device
printk("%s device %s discarded\n", __FUNCTION__,
printk("%s device %s discarded\n", __func__,
pci_name(pPciDev));
iResult = -ENODEV;
goto Exit;
Expand All @@ -953,15 +953,15 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
if (pPciDev->revision >= 0x20) {
printk
("%s device %s is an enhanced 8139C+ version, which is not supported\n",
__FUNCTION__, pci_name(pPciDev));
__func__, pci_name(pPciDev));
iResult = -ENODEV;
goto Exit;
}

EdrvInstance_l.m_pPciDev = pPciDev;

// enable device
printk("%s enable device\n", __FUNCTION__);
printk("%s enable device\n", __func__);
iResult = pci_enable_device(pPciDev);
if (iResult != 0) {
goto Exit;
Expand All @@ -972,13 +972,13 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
goto Exit;
}

printk("%s request regions\n", __FUNCTION__);
printk("%s request regions\n", __func__);
iResult = pci_request_regions(pPciDev, DRV_NAME);
if (iResult != 0) {
goto Exit;
}

printk("%s ioremap\n", __FUNCTION__);
printk("%s ioremap\n", __func__);
EdrvInstance_l.m_pIoAddr =
ioremap(pci_resource_start(pPciDev, 1),
pci_resource_len(pPciDev, 1));
Expand All @@ -987,11 +987,11 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
goto Exit;
}
// enable PCI busmaster
printk("%s enable busmaster\n", __FUNCTION__);
printk("%s enable busmaster\n", __func__);
pci_set_master(pPciDev);

// reset controller
printk("%s reset controller\n", __FUNCTION__);
printk("%s reset controller\n", __func__);
EDRV_REGB_WRITE(EDRV_REGB_COMMAND, EDRV_REGB_COMMAND_RST);

// wait until reset has finished
Expand All @@ -1008,20 +1008,20 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
dwTemp = EDRV_REGDW_READ(EDRV_REGDW_TCR);
if (((dwTemp & EDRV_REGDW_TCR_VER_MASK) != EDRV_REGDW_TCR_VER_C)
&& ((dwTemp & EDRV_REGDW_TCR_VER_MASK) != EDRV_REGDW_TCR_VER_D)) { // unsupported chip
printk("%s Unsupported chip! TCR = 0x%08lX\n", __FUNCTION__,
printk("%s Unsupported chip! TCR = 0x%08lX\n", __func__,
dwTemp);
iResult = -ENODEV;
goto Exit;
}
// disable interrupts
printk("%s disable interrupts\n", __FUNCTION__);
printk("%s disable interrupts\n", __func__);
EDRV_REGW_WRITE(EDRV_REGW_INT_MASK, 0);
// acknowledge all pending interrupts
EDRV_REGW_WRITE(EDRV_REGW_INT_STATUS,
EDRV_REGW_READ(EDRV_REGW_INT_STATUS));

// install interrupt handler
printk("%s install interrupt handler\n", __FUNCTION__);
printk("%s install interrupt handler\n", __func__);
iResult =
request_irq(pPciDev->irq, TgtEthIsr, IRQF_SHARED,
DRV_NAME /*pPciDev->dev.name */ , pPciDev);
Expand All @@ -1031,16 +1031,16 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)

/*
// unlock configuration registers
printk("%s unlock configuration registers\n", __FUNCTION__);
printk("%s unlock configuration registers\n", __func__);
EDRV_REGB_WRITE(EDRV_REGB_CMD9346, EDRV_REGB_CMD9346_UNLOCK);
// check if user specified a MAC address
printk("%s check specified MAC address\n", __FUNCTION__);
printk("%s check specified MAC address\n", __func__);
for (iResult = 0; iResult < 6; iResult++)
{
if (EdrvInstance_l.m_InitParam.m_abMyMacAddr[iResult] != 0)
{
printk("%s set local MAC address\n", __FUNCTION__);
printk("%s set local MAC address\n", __func__);
// write this MAC address to controller
EDRV_REGDW_WRITE(EDRV_REGDW_IDR0,
le32_to_cpu(*((DWORD*)&EdrvInstance_l.m_InitParam.m_abMyMacAddr[0])));
Expand All @@ -1059,7 +1059,7 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
*/

// allocate buffers
printk("%s allocate buffers\n", __FUNCTION__);
printk("%s allocate buffers\n", __func__);
EdrvInstance_l.m_pbTxBuf =
pci_alloc_consistent(pPciDev, EDRV_TX_BUFFER_SIZE,
&EdrvInstance_l.m_pTxBufDma);
Expand All @@ -1076,7 +1076,7 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
goto Exit;
}
// reset pointers for Tx buffers
printk("%s reset pointers fo Tx buffers\n", __FUNCTION__);
printk("%s reset pointers fo Tx buffers\n", __func__);
EDRV_REGDW_WRITE(EDRV_REGDW_TSAD0, 0);
dwTemp = EDRV_REGDW_READ(EDRV_REGDW_TSAD0);
EDRV_REGDW_WRITE(EDRV_REGDW_TSAD1, 0);
Expand All @@ -1090,11 +1090,11 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
(WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND));

// set pointer for receive buffer in controller
printk("%s set pointer to Rx buffer\n", __FUNCTION__);
printk("%s set pointer to Rx buffer\n", __func__);
EDRV_REGDW_WRITE(EDRV_REGDW_RBSTART, EdrvInstance_l.m_pRxBufDma);

// enable transmitter and receiver
printk("%s enable Tx and Rx", __FUNCTION__);
printk("%s enable Tx and Rx", __func__);
EDRV_REGB_WRITE(EDRV_REGB_COMMAND,
(EDRV_REGB_COMMAND_RE | EDRV_REGB_COMMAND_TE));
printk(" Command = 0x%02X\n",
Expand All @@ -1104,12 +1104,12 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)
EDRV_REGDW_WRITE(EDRV_REGDW_MPC, 0);

// set transmit configuration register
printk("%s set Tx conf register", __FUNCTION__);
printk("%s set Tx conf register", __func__);
EDRV_REGDW_WRITE(EDRV_REGDW_TCR, EDRV_REGDW_TCR_DEF);
printk(" = 0x%08X\n", EDRV_REGDW_READ(EDRV_REGDW_TCR));

// set receive configuration register
printk("%s set Rx conf register", __FUNCTION__);
printk("%s set Rx conf register", __func__);
EDRV_REGDW_WRITE(EDRV_REGDW_RCR, EDRV_REGDW_RCR_DEF);
printk(" = 0x%08X\n", EDRV_REGDW_READ(EDRV_REGDW_RCR));

Expand All @@ -1121,19 +1121,19 @@ static int EdrvInitOne(struct pci_dev *pPciDev, const struct pci_device_id *pId)

/*
// enable transmitter and receiver
printk("%s enable Tx and Rx", __FUNCTION__);
printk("%s enable Tx and Rx", __func__);
EDRV_REGB_WRITE(EDRV_REGB_COMMAND, (EDRV_REGB_COMMAND_RE | EDRV_REGB_COMMAND_TE));
printk(" Command = 0x%02X\n", (WORD) EDRV_REGB_READ(EDRV_REGB_COMMAND));
*/
// disable early interrupts
EDRV_REGW_WRITE(EDRV_REGW_MULINT, 0);

// enable interrupts
printk("%s enable interrupts\n", __FUNCTION__);
printk("%s enable interrupts\n", __func__);
EDRV_REGW_WRITE(EDRV_REGW_INT_MASK, EDRV_REGW_INT_MASK_DEF);

Exit:
printk("%s finished with %d\n", __FUNCTION__, iResult);
printk("%s finished with %d\n", __func__, iResult);
return iResult;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/epl/EplSdoAsySequ.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ static tEplKernel EplSdoAsySeqProcess(unsigned int uiHandle_p,
{
/*
PRINTF3("%s scon=%u rcon=%u\n",
__FUNCTION__,
__func__,
pRecFrame_p->m_le_bSendSeqNumCon,
pRecFrame_p->m_le_bRecSeqNumCon);
*/
Expand Down
12 changes: 6 additions & 6 deletions drivers/staging/frontier/alphatrack.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ static void usb_alphatrack_interrupt_in_callback(struct urb *urb)
goto exit;
} else {
dbg_info(&dev->intf->dev, "%s: nonzero status received: %d\n",
__FUNCTION__, urb->status);
__func__, urb->status);
goto resubmit; /* maybe we can recover */
}
}
Expand All @@ -261,7 +261,7 @@ static void usb_alphatrack_interrupt_in_callback(struct urb *urb)
if(dev->offline > 0 && dev->interrupt_in_buffer[1] != 0xff) { dev->offline = 0; }
if(dev->offline == 0 && dev->interrupt_in_buffer[1] == 0xff) { dev->offline = 1; }
#endif
dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __FUNCTION__,dev->ring_head,dev->ring_tail);
dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __func__,dev->ring_head,dev->ring_tail);
next_ring_head = (dev->ring_head+1) % ring_buffer_size;

if (next_ring_head != dev->ring_tail) {
Expand Down Expand Up @@ -305,7 +305,7 @@ static void usb_alphatrack_interrupt_out_callback(struct urb *urb)
urb->status == -ESHUTDOWN))
dbg_info(&dev->intf->dev,
"%s - nonzero write interrupt status received: %d\n",
__FUNCTION__, urb->status);
__func__, urb->status);
atomic_dec(&dev->writes_pending);
dev->interrupt_out_busy = 0;
wake_up_interruptible(&dev->write_wait);
Expand All @@ -330,7 +330,7 @@ static int usb_alphatrack_open(struct inode *inode, struct file *file)

if (!interface) {
err("%s - error, can't find device for minor %d\n",
__FUNCTION__, subminor);
__func__, subminor);
retval = -ENODEV;
goto unlock_disconnect_exit;
}
Expand Down Expand Up @@ -514,7 +514,7 @@ static ssize_t usb_alphatrack_read(struct file *file, char __user *buffer, size_
}
dev->ring_tail = (dev->ring_tail+1) % ring_buffer_size;
c+=INPUT_CMD_SIZE;
dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __FUNCTION__,dev->ring_head,dev->ring_tail);
dbg_info(&dev->intf->dev, "%s: head, tail are %x, %x\n", __func__,dev->ring_head,dev->ring_tail);
}
retval = c;

Expand Down Expand Up @@ -573,7 +573,7 @@ static ssize_t usb_alphatrack_write(struct file *file, const char __user *buffer
if (bytes_to_write < count)
dev_warn(&dev->intf->dev, "Write buffer overflow, %zd bytes dropped\n",count-bytes_to_write);

dbg_info(&dev->intf->dev, "%s: count = %zd, bytes_to_write = %zd\n", __FUNCTION__, count, bytes_to_write);
dbg_info(&dev->intf->dev, "%s: count = %zd, bytes_to_write = %zd\n", __func__, count, bytes_to_write);

if (copy_from_user(dev->interrupt_out_buffer, buffer, bytes_to_write)) {
retval = -EFAULT;
Expand Down
Loading

0 comments on commit d599edc

Please sign in to comment.