Skip to content

Commit

Permalink
irda: replace __FUNCTION__ with __func__
Browse files Browse the repository at this point in the history 
__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>
  • Loading branch information
Harvey Harrison authored and David S. Miller committed Jul 31, 2008
1 parent 1fa9817 commit a97a6f1
Show file tree
Hide file tree
Showing 22 changed files with 520 additions and 519 deletions.
10 changes: 5 additions & 5 deletions drivers/net/irda/act200l-sir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/irda/actisys-sir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading

0 comments on commit a97a6f1

Please sign in to comment.