Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a97a6f10 authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

irda: replace __FUNCTION__ with __func__ 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1fa98174

drivers/net/irda/act200l-sir.c

+5 −5
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static int act200l_open(struct sir_dev *dev) 
{

	struct qos_info *qos = &dev->qos;



	IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );

	IRDA_DEBUG(2, "%s()\n", __func__ );



	/* Power on the dongle */

	sirdev_set_dtr_rts(dev, TRUE, TRUE);
@@ -124,7 +124,7 @@ static int act200l_open(struct sir_dev *dev) 


static int act200l_close(struct sir_dev *dev)

{

	IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );

	IRDA_DEBUG(2, "%s()\n", __func__ );



	/* Power off the dongle */

	sirdev_set_dtr_rts(dev, FALSE, FALSE);
@@ -143,7 +143,7 @@ static int act200l_change_speed(struct sir_dev *dev, unsigned speed) 
	u8 control[3];

	int ret = 0;



	IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );

	IRDA_DEBUG(2, "%s()\n", __func__ );



	/* Clear DTR and set RTS to enter command mode */

	sirdev_set_dtr_rts(dev, FALSE, TRUE);
@@ -212,7 +212,7 @@ static int act200l_reset(struct sir_dev *dev) 
	};

	int ret = 0;



	IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );

	IRDA_DEBUG(2, "%s()\n", __func__ );



	switch (state) {

	case SIRDEV_STATE_DONGLE_RESET:
@@ -240,7 +240,7 @@ static int act200l_reset(struct sir_dev *dev) 
		dev->speed = 9600;

		break;

	default:

		IRDA_ERROR("%s(), unknown state %d\n", __FUNCTION__, state);

		IRDA_ERROR("%s(), unknown state %d\n", __func__, state);

		ret = -1;

		break;

	}

drivers/net/irda/actisys-sir.c

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static int actisys_change_speed(struct sir_dev *dev, unsigned speed) 
	int ret = 0;

	int i = 0;



        IRDA_DEBUG(4, "%s(), speed=%d (was %d)\n", __FUNCTION__,

        IRDA_DEBUG(4, "%s(), speed=%d (was %d)\n", __func__,

        	speed, dev->speed);



	/* dongle was already resetted from irda_request state machine,

drivers/net/irda/ali-ircc.c

+123 −123

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/irda/donauboe.c

+34 −34
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ toshoboe_dumpregs (struct toshoboe_cb *self) 
{

  __u32 ringbase;



  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);

  IRDA_DEBUG (4, "%s()\n", __func__);



  ringbase = INB (OBOE_RING_BASE0) << 10;

  ringbase |= INB (OBOE_RING_BASE1) << 18;
@@ -293,7 +293,7 @@ static void 
toshoboe_disablebm (struct toshoboe_cb *self)

{

  __u8 command;

  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);

  IRDA_DEBUG (4, "%s()\n", __func__);



  pci_read_config_byte (self->pdev, PCI_COMMAND, &command);

  command &= ~PCI_COMMAND_MASTER;
@@ -305,7 +305,7 @@ toshoboe_disablebm (struct toshoboe_cb *self) 
static void

toshoboe_stopchip (struct toshoboe_cb *self)

{

  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);

  IRDA_DEBUG (4, "%s()\n", __func__);



  /*Disable interrupts */

  OUTB (0x0, OBOE_IER);
@@ -350,7 +350,7 @@ toshoboe_setbaud (struct toshoboe_cb *self) 
  __u16 pconfig = 0;

  __u8 config0l = 0;



  IRDA_DEBUG (2, "%s(%d/%d)\n", __FUNCTION__, self->speed, self->io.speed);

  IRDA_DEBUG (2, "%s(%d/%d)\n", __func__, self->speed, self->io.speed);



  switch (self->speed)

    {
@@ -482,7 +482,7 @@ toshoboe_setbaud (struct toshoboe_cb *self) 
static void

toshoboe_enablebm (struct toshoboe_cb *self)

{

  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);

  IRDA_DEBUG (4, "%s()\n", __func__);

  pci_set_master (self->pdev);

}
@@ -492,7 +492,7 @@ toshoboe_initring (struct toshoboe_cb *self) 
{

  int i;



  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);

  IRDA_DEBUG (4, "%s()\n", __func__);



  for (i = 0; i < TX_SLOTS; ++i)

    {
@@ -550,7 +550,7 @@ toshoboe_startchip (struct toshoboe_cb *self) 
{

  __u32 physaddr;



  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);

  IRDA_DEBUG (4, "%s()\n", __func__);



  toshoboe_initring (self);

  toshoboe_enablebm (self);
@@ -824,7 +824,7 @@ toshoboe_probe (struct toshoboe_cb *self) 
#endif

  unsigned long flags;



  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);

  IRDA_DEBUG (4, "%s()\n", __func__);



  if (request_irq (self->io.irq, toshoboe_probeinterrupt,

                   self->io.irqflags, "toshoboe", (void *) self))
@@ -983,10 +983,10 @@ toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev) 


  IRDA_ASSERT (self != NULL, return 0; );



  IRDA_DEBUG (1, "%s.tx:%x(%x)%x\n", __FUNCTION__

  IRDA_DEBUG (1, "%s.tx:%x(%x)%x\n", __func__

      ,skb->len,self->txpending,INB (OBOE_ENABLEH));

  if (!cb->magic) {

      IRDA_DEBUG (2, "%s.Not IrLAP:%x\n", __FUNCTION__, cb->magic);

      IRDA_DEBUG (2, "%s.Not IrLAP:%x\n", __func__, cb->magic);

#ifdef DUMP_PACKETS

      _dumpbufs(skb->data,skb->len,'>');

#endif
@@ -1015,7 +1015,7 @@ toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev) 
        {

          self->new_speed = speed;

          IRDA_DEBUG (1, "%s: Queued TxDone scheduled speed change %d\n" ,

		      __FUNCTION__, speed);

		      __func__, speed);

          /* if no data, that's all! */

          if (!skb->len)

            {
@@ -1057,7 +1057,7 @@ toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev) 
      /* which we will add a wrong checksum to */



      mtt = toshoboe_makemttpacket (self, self->tx_bufs[self->txs], mtt);

      IRDA_DEBUG (1, "%s.mtt:%x(%x)%d\n", __FUNCTION__

      IRDA_DEBUG (1, "%s.mtt:%x(%x)%d\n", __func__

          ,skb->len,mtt,self->txpending);

      if (mtt)

        {
@@ -1101,7 +1101,7 @@ dumpbufs(skb->data,skb->len,'>'); 


  if (self->ring->tx[self->txs].control & OBOE_CTL_TX_HW_OWNS)

    {

      IRDA_DEBUG (0, "%s.ful:%x(%x)%x\n", __FUNCTION__

      IRDA_DEBUG (0, "%s.ful:%x(%x)%x\n", __func__

          ,skb->len, self->ring->tx[self->txs].control, self->txpending);

      toshoboe_start_DMA(self, OBOE_CONFIG0H_ENTX);

      spin_unlock_irqrestore(&self->spinlock, flags);
@@ -1179,7 +1179,7 @@ toshoboe_interrupt (int irq, void *dev_id) 
          if (self->ring->tx[i].control & OBOE_CTL_TX_HW_OWNS)

              self->txpending++;

        }

      IRDA_DEBUG (1, "%s.txd(%x)%x/%x\n", __FUNCTION__

      IRDA_DEBUG (1, "%s.txd(%x)%x/%x\n", __func__

          ,irqstat,txp,self->txpending);



      txp = INB (OBOE_TXSLOT) & OBOE_SLOT_MASK;
@@ -1209,7 +1209,7 @@ toshoboe_interrupt (int irq, void *dev_id) 
        {

          self->speed = self->new_speed;

          IRDA_DEBUG (1, "%s: Executed TxDone scheduled speed change %d\n",

		      __FUNCTION__, self->speed);

		      __func__, self->speed);

          toshoboe_setbaud (self);

        }
@@ -1224,7 +1224,7 @@ toshoboe_interrupt (int irq, void *dev_id) 
        {

          int len = self->ring->rx[self->rxs].len;

          skb = NULL;

          IRDA_DEBUG (3, "%s.rcv:%x(%x)\n", __FUNCTION__

          IRDA_DEBUG (3, "%s.rcv:%x(%x)\n", __func__

		      ,len,self->ring->rx[self->rxs].control);



#ifdef DUMP_PACKETS
@@ -1246,7 +1246,7 @@ dumpbufs(self->rx_bufs[self->rxs],len,'<'); 
                      len -= 2;

                  else

                      len = 0;

                  IRDA_DEBUG (1, "%s.SIR:%x(%x)\n", __FUNCTION__, len,enable);

                  IRDA_DEBUG (1, "%s.SIR:%x(%x)\n", __func__, len,enable);

                }



#ifdef USE_MIR
@@ -1256,7 +1256,7 @@ dumpbufs(self->rx_bufs[self->rxs],len,'<'); 
                      len -= 2;

                  else

                      len = 0;

                  IRDA_DEBUG (2, "%s.MIR:%x(%x)\n", __FUNCTION__, len,enable);

                  IRDA_DEBUG (2, "%s.MIR:%x(%x)\n", __func__, len,enable);

                }

#endif

              else if (enable & OBOE_ENABLEH_FIRON)
@@ -1265,10 +1265,10 @@ dumpbufs(self->rx_bufs[self->rxs],len,'<'); 
                      len -= 4;   /*FIXME: check this */

                  else

                      len = 0;

                  IRDA_DEBUG (1, "%s.FIR:%x(%x)\n", __FUNCTION__, len,enable);

                  IRDA_DEBUG (1, "%s.FIR:%x(%x)\n", __func__, len,enable);

                }

              else

                  IRDA_DEBUG (0, "%s.?IR:%x(%x)\n", __FUNCTION__, len,enable);

                  IRDA_DEBUG (0, "%s.?IR:%x(%x)\n", __func__, len,enable);



              if (len)

                {
@@ -1289,7 +1289,7 @@ dumpbufs(self->rx_bufs[self->rxs],len,'<'); 
                    {

                      printk (KERN_INFO

                              "%s(), memory squeeze, dropping frame.\n",

			      __FUNCTION__);

			      __func__);

                    }

                }

            }
@@ -1301,7 +1301,7 @@ dumpbufs(self->rx_bufs[self->rxs],len,'<'); 
            /* (SIR) data is splitted in several slots. */

            /* we have to join all the received buffers received */

            /*in a large buffer before checking CRC. */

            IRDA_DEBUG (0, "%s.err:%x(%x)\n", __FUNCTION__

            IRDA_DEBUG (0, "%s.err:%x(%x)\n", __func__

                ,len,self->ring->rx[self->rxs].control);

            }
@@ -1329,7 +1329,7 @@ dumpbufs(self->rx_bufs[self->rxs],len,'<'); 
  if (irqstat & OBOE_INT_SIP)

    {

      self->int_sip++;

      IRDA_DEBUG (1, "%s.sip:%x(%x)%x\n", __FUNCTION__

      IRDA_DEBUG (1, "%s.sip:%x(%x)%x\n", __func__

	      ,self->int_sip,irqstat,self->txpending);

    }

  return IRQ_HANDLED;
@@ -1343,7 +1343,7 @@ toshoboe_net_open (struct net_device *dev) 
  unsigned long flags;

  int rc;



  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);

  IRDA_DEBUG (4, "%s()\n", __func__);



  self = netdev_priv(dev);
@@ -1381,7 +1381,7 @@ toshoboe_net_close (struct net_device *dev) 
{

  struct toshoboe_cb *self;



  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);

  IRDA_DEBUG (4, "%s()\n", __func__);



  IRDA_ASSERT (dev != NULL, return -1; );

  self = (struct toshoboe_cb *) dev->priv;
@@ -1426,7 +1426,7 @@ toshoboe_net_ioctl (struct net_device *dev, struct ifreq *rq, int cmd) 


  IRDA_ASSERT (self != NULL, return -1; );



  IRDA_DEBUG (5, "%s(), %s, (cmd=0x%X)\n", __FUNCTION__, dev->name, cmd);

  IRDA_DEBUG (5, "%s(), %s, (cmd=0x%X)\n", __func__, dev->name, cmd);



  /* Disable interrupts & save flags */

  spin_lock_irqsave(&self->spinlock, flags);
@@ -1438,7 +1438,7 @@ toshoboe_net_ioctl (struct net_device *dev, struct ifreq *rq, int cmd) 
       * speed, so we still must allow for speed change within

       * interrupt context.

       */

      IRDA_DEBUG (1, "%s(BANDWIDTH), %s, (%X/%ld\n", __FUNCTION__

      IRDA_DEBUG (1, "%s(BANDWIDTH), %s, (%X/%ld\n", __func__

          ,dev->name, INB (OBOE_STATUS), irq->ifr_baudrate );

      if (!in_interrupt () && !capable (CAP_NET_ADMIN)) {

	ret = -EPERM;
@@ -1451,7 +1451,7 @@ toshoboe_net_ioctl (struct net_device *dev, struct ifreq *rq, int cmd) 
      self->new_speed = irq->ifr_baudrate;

      break;

    case SIOCSMEDIABUSY:       /* Set media busy */

      IRDA_DEBUG (1, "%s(MEDIABUSY), %s, (%X/%x)\n", __FUNCTION__

      IRDA_DEBUG (1, "%s(MEDIABUSY), %s, (%X/%x)\n", __func__

          ,dev->name, INB (OBOE_STATUS), capable (CAP_NET_ADMIN) );

      if (!capable (CAP_NET_ADMIN)) {

	ret = -EPERM;
@@ -1461,11 +1461,11 @@ toshoboe_net_ioctl (struct net_device *dev, struct ifreq *rq, int cmd) 
      break;

    case SIOCGRECEIVING:       /* Check if we are receiving right now */

      irq->ifr_receiving = (INB (OBOE_STATUS) & OBOE_STATUS_RXBUSY) ? 1 : 0;

      IRDA_DEBUG (3, "%s(RECEIVING), %s, (%X/%x)\n", __FUNCTION__

      IRDA_DEBUG (3, "%s(RECEIVING), %s, (%X/%x)\n", __func__

          ,dev->name, INB (OBOE_STATUS), irq->ifr_receiving );

      break;

    default:

      IRDA_DEBUG (1, "%s(?), %s, (cmd=0x%X)\n", __FUNCTION__, dev->name, cmd);

      IRDA_DEBUG (1, "%s(?), %s, (cmd=0x%X)\n", __func__, dev->name, cmd);

      ret = -EOPNOTSUPP;

    }

out:
@@ -1492,7 +1492,7 @@ toshoboe_close (struct pci_dev *pci_dev) 
  int i;

  struct toshoboe_cb *self = (struct toshoboe_cb*)pci_get_drvdata(pci_dev);



  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);

  IRDA_DEBUG (4, "%s()\n", __func__);



  IRDA_ASSERT (self != NULL, return; );
@@ -1533,7 +1533,7 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid) 
  int ok = 0;

  int err;



  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);

  IRDA_DEBUG (4, "%s()\n", __func__);



  if ((err=pci_enable_device(pci_dev)))

    return err;
@@ -1700,7 +1700,7 @@ toshoboe_gotosleep (struct pci_dev *pci_dev, pm_message_t crap) 
  unsigned long flags;

  int i = 10;



  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);

  IRDA_DEBUG (4, "%s()\n", __func__);



  if (!self || self->stopped)

    return 0;
@@ -1728,7 +1728,7 @@ toshoboe_wakeup (struct pci_dev *pci_dev) 
  struct toshoboe_cb *self = (struct toshoboe_cb*)pci_get_drvdata(pci_dev);

  unsigned long flags;



  IRDA_DEBUG (4, "%s()\n", __FUNCTION__);

  IRDA_DEBUG (4, "%s()\n", __func__);



  if (!self || !self->stopped)

    return 0;

drivers/net/irda/girbil-sir.c

+6 −6
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static int girbil_open(struct sir_dev *dev) 
{

	struct qos_info *qos = &dev->qos;



	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);

	IRDA_DEBUG(2, "%s()\n", __func__);



	/* Power on dongle */

	sirdev_set_dtr_rts(dev, TRUE, TRUE);
@@ -102,7 +102,7 @@ static int girbil_open(struct sir_dev *dev) 


static int girbil_close(struct sir_dev *dev)

{

	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);

	IRDA_DEBUG(2, "%s()\n", __func__);



	/* Power off dongle */

	sirdev_set_dtr_rts(dev, FALSE, FALSE);
@@ -126,7 +126,7 @@ static int girbil_change_speed(struct sir_dev *dev, unsigned speed) 
	u8 control[2];

	static int ret = 0;



	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);

	IRDA_DEBUG(2, "%s()\n", __func__);



	/* dongle alread reset - port and dongle at default speed */
@@ -179,7 +179,7 @@ static int girbil_change_speed(struct sir_dev *dev, unsigned speed) 
		break;



	default:

		IRDA_ERROR("%s - undefined state %d\n", __FUNCTION__, state);

		IRDA_ERROR("%s - undefined state %d\n", __func__, state);

		ret = -EINVAL;

		break;

	}
@@ -209,7 +209,7 @@ static int girbil_reset(struct sir_dev *dev) 
	u8 control = GIRBIL_TXEN | GIRBIL_RXEN;

	int ret = 0;



	IRDA_DEBUG(2, "%s()\n", __FUNCTION__);

	IRDA_DEBUG(2, "%s()\n", __func__);



	switch (state) {

	case SIRDEV_STATE_DONGLE_RESET:
@@ -241,7 +241,7 @@ static int girbil_reset(struct sir_dev *dev) 
		break;



	default:

		IRDA_ERROR("%s(), undefined state %d\n", __FUNCTION__, state);

		IRDA_ERROR("%s(), undefined state %d\n", __func__, state);

		ret = -1;

		break;

	}