aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/core/devio.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-03-03 19:08:34 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-04-25 00:16:55 -0400
commit441b62c1edb986827154768d89bbac0ba779984f (patch)
tree13724c22d1b190a36f0ddbba38554e6c66bea6af /drivers/usb/core/devio.c
parent14722ef4acedc643f0b78b7165ceff2d300dae4d (diff)
USB: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core/devio.c')
-rw-r--r--drivers/usb/core/devio.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 6c4cd82d7d1..de17738f3ac 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1530,60 +1530,60 @@ static int usbdev_ioctl(struct inode *inode, struct file *file,
1530 1530
1531 switch (cmd) { 1531 switch (cmd) {
1532 case USBDEVFS_CONTROL: 1532 case USBDEVFS_CONTROL:
1533 snoop(&dev->dev, "%s: CONTROL\n", __FUNCTION__); 1533 snoop(&dev->dev, "%s: CONTROL\n", __func__);
1534 ret = proc_control(ps, p); 1534 ret = proc_control(ps, p);
1535 if (ret >= 0) 1535 if (ret >= 0)
1536 inode->i_mtime = CURRENT_TIME; 1536 inode->i_mtime = CURRENT_TIME;
1537 break; 1537 break;
1538 1538
1539 case USBDEVFS_BULK: 1539 case USBDEVFS_BULK:
1540 snoop(&dev->dev, "%s: BULK\n", __FUNCTION__); 1540 snoop(&dev->dev, "%s: BULK\n", __func__);
1541 ret = proc_bulk(ps, p); 1541 ret = proc_bulk(ps, p);
1542 if (ret >= 0) 1542 if (ret >= 0)
1543 inode->i_mtime = CURRENT_TIME; 1543 inode->i_mtime = CURRENT_TIME;
1544 break; 1544 break;
1545 1545
1546 case USBDEVFS_RESETEP: 1546 case USBDEVFS_RESETEP:
1547 snoop(&dev->dev, "%s: RESETEP\n", __FUNCTION__); 1547 snoop(&dev->dev, "%s: RESETEP\n", __func__);
1548 ret = proc_resetep(ps, p); 1548 ret = proc_resetep(ps, p);
1549 if (ret >= 0) 1549 if (ret >= 0)
1550 inode->i_mtime = CURRENT_TIME; 1550 inode->i_mtime = CURRENT_TIME;
1551 break; 1551 break;
1552 1552
1553 case USBDEVFS_RESET: 1553 case USBDEVFS_RESET:
1554 snoop(&dev->dev, "%s: RESET\n", __FUNCTION__); 1554 snoop(&dev->dev, "%s: RESET\n", __func__);
1555 ret = proc_resetdevice(ps); 1555 ret = proc_resetdevice(ps);
1556 break; 1556 break;
1557 1557
1558 case USBDEVFS_CLEAR_HALT: 1558 case USBDEVFS_CLEAR_HALT:
1559 snoop(&dev->dev, "%s: CLEAR_HALT\n", __FUNCTION__); 1559 snoop(&dev->dev, "%s: CLEAR_HALT\n", __func__);
1560 ret = proc_clearhalt(ps, p); 1560 ret = proc_clearhalt(ps, p);
1561 if (ret >= 0) 1561 if (ret >= 0)
1562 inode->i_mtime = CURRENT_TIME; 1562 inode->i_mtime = CURRENT_TIME;
1563 break; 1563 break;
1564 1564
1565 case USBDEVFS_GETDRIVER: 1565 case USBDEVFS_GETDRIVER:
1566 snoop(&dev->dev, "%s: GETDRIVER\n", __FUNCTION__); 1566 snoop(&dev->dev, "%s: GETDRIVER\n", __func__);
1567 ret = proc_getdriver(ps, p); 1567 ret = proc_getdriver(ps, p);
1568 break; 1568 break;
1569 1569
1570 case USBDEVFS_CONNECTINFO: 1570 case USBDEVFS_CONNECTINFO:
1571 snoop(&dev->dev, "%s: CONNECTINFO\n", __FUNCTION__); 1571 snoop(&dev->dev, "%s: CONNECTINFO\n", __func__);
1572 ret = proc_connectinfo(ps, p); 1572 ret = proc_connectinfo(ps, p);
1573 break; 1573 break;
1574 1574
1575 case USBDEVFS_SETINTERFACE: 1575 case USBDEVFS_SETINTERFACE:
1576 snoop(&dev->dev, "%s: SETINTERFACE\n", __FUNCTION__); 1576 snoop(&dev->dev, "%s: SETINTERFACE\n", __func__);
1577 ret = proc_setintf(ps, p); 1577 ret = proc_setintf(ps, p);
1578 break; 1578 break;
1579 1579
1580 case USBDEVFS_SETCONFIGURATION: 1580 case USBDEVFS_SETCONFIGURATION:
1581 snoop(&dev->dev, "%s: SETCONFIGURATION\n", __FUNCTION__); 1581 snoop(&dev->dev, "%s: SETCONFIGURATION\n", __func__);
1582 ret = proc_setconfig(ps, p); 1582 ret = proc_setconfig(ps, p);
1583 break; 1583 break;
1584 1584
1585 case USBDEVFS_SUBMITURB: 1585 case USBDEVFS_SUBMITURB:
1586 snoop(&dev->dev, "%s: SUBMITURB\n", __FUNCTION__); 1586 snoop(&dev->dev, "%s: SUBMITURB\n", __func__);
1587 ret = proc_submiturb(ps, p); 1587 ret = proc_submiturb(ps, p);
1588 if (ret >= 0) 1588 if (ret >= 0)
1589 inode->i_mtime = CURRENT_TIME; 1589 inode->i_mtime = CURRENT_TIME;
@@ -1592,60 +1592,60 @@ static int usbdev_ioctl(struct inode *inode, struct file *file,
1592#ifdef CONFIG_COMPAT 1592#ifdef CONFIG_COMPAT
1593 1593
1594 case USBDEVFS_SUBMITURB32: 1594 case USBDEVFS_SUBMITURB32:
1595 snoop(&dev->dev, "%s: SUBMITURB32\n", __FUNCTION__); 1595 snoop(&dev->dev, "%s: SUBMITURB32\n", __func__);
1596 ret = proc_submiturb_compat(ps, p); 1596 ret = proc_submiturb_compat(ps, p);
1597 if (ret >= 0) 1597 if (ret >= 0)
1598 inode->i_mtime = CURRENT_TIME; 1598 inode->i_mtime = CURRENT_TIME;
1599 break; 1599 break;
1600 1600
1601 case USBDEVFS_REAPURB32: 1601 case USBDEVFS_REAPURB32:
1602 snoop(&dev->dev, "%s: REAPURB32\n", __FUNCTION__); 1602 snoop(&dev->dev, "%s: REAPURB32\n", __func__);
1603 ret = proc_reapurb_compat(ps, p); 1603 ret = proc_reapurb_compat(ps, p);
1604 break; 1604 break;
1605 1605
1606 case USBDEVFS_REAPURBNDELAY32: 1606 case USBDEVFS_REAPURBNDELAY32:
1607 snoop(&dev->dev, "%s: REAPURBDELAY32\n", __FUNCTION__); 1607 snoop(&dev->dev, "%s: REAPURBDELAY32\n", __func__);
1608 ret = proc_reapurbnonblock_compat(ps, p); 1608 ret = proc_reapurbnonblock_compat(ps, p);
1609 break; 1609 break;
1610 1610
1611 case USBDEVFS_IOCTL32: 1611 case USBDEVFS_IOCTL32:
1612 snoop(&dev->dev, "%s: IOCTL\n", __FUNCTION__); 1612 snoop(&dev->dev, "%s: IOCTL\n", __func__);
1613 ret = proc_ioctl_compat(ps, ptr_to_compat(p)); 1613 ret = proc_ioctl_compat(ps, ptr_to_compat(p));
1614 break; 1614 break;
1615#endif 1615#endif
1616 1616
1617 case USBDEVFS_DISCARDURB: 1617 case USBDEVFS_DISCARDURB:
1618 snoop(&dev->dev, "%s: DISCARDURB\n", __FUNCTION__); 1618 snoop(&dev->dev, "%s: DISCARDURB\n", __func__);
1619 ret = proc_unlinkurb(ps, p); 1619 ret = proc_unlinkurb(ps, p);
1620 break; 1620 break;
1621 1621
1622 case USBDEVFS_REAPURB: 1622 case USBDEVFS_REAPURB:
1623 snoop(&dev->dev, "%s: REAPURB\n", __FUNCTION__); 1623 snoop(&dev->dev, "%s: REAPURB\n", __func__);
1624 ret = proc_reapurb(ps, p); 1624 ret = proc_reapurb(ps, p);
1625 break; 1625 break;
1626 1626
1627 case USBDEVFS_REAPURBNDELAY: 1627 case USBDEVFS_REAPURBNDELAY:
1628 snoop(&dev->dev, "%s: REAPURBDELAY\n", __FUNCTION__); 1628 snoop(&dev->dev, "%s: REAPURBDELAY\n", __func__);
1629 ret = proc_reapurbnonblock(ps, p); 1629 ret = proc_reapurbnonblock(ps, p);
1630 break; 1630 break;
1631 1631
1632 case USBDEVFS_DISCSIGNAL: 1632 case USBDEVFS_DISCSIGNAL:
1633 snoop(&dev->dev, "%s: DISCSIGNAL\n", __FUNCTION__); 1633 snoop(&dev->dev, "%s: DISCSIGNAL\n", __func__);
1634 ret = proc_disconnectsignal(ps, p); 1634 ret = proc_disconnectsignal(ps, p);
1635 break; 1635 break;
1636 1636
1637 case USBDEVFS_CLAIMINTERFACE: 1637 case USBDEVFS_CLAIMINTERFACE:
1638 snoop(&dev->dev, "%s: CLAIMINTERFACE\n", __FUNCTION__); 1638 snoop(&dev->dev, "%s: CLAIMINTERFACE\n", __func__);
1639 ret = proc_claiminterface(ps, p); 1639 ret = proc_claiminterface(ps, p);
1640 break; 1640 break;
1641 1641
1642 case USBDEVFS_RELEASEINTERFACE: 1642 case USBDEVFS_RELEASEINTERFACE:
1643 snoop(&dev->dev, "%s: RELEASEINTERFACE\n", __FUNCTION__); 1643 snoop(&dev->dev, "%s: RELEASEINTERFACE\n", __func__);
1644 ret = proc_releaseinterface(ps, p); 1644 ret = proc_releaseinterface(ps, p);
1645 break; 1645 break;
1646 1646
1647 case USBDEVFS_IOCTL: 1647 case USBDEVFS_IOCTL:
1648 snoop(&dev->dev, "%s: IOCTL\n", __FUNCTION__); 1648 snoop(&dev->dev, "%s: IOCTL\n", __func__);
1649 ret = proc_ioctl_default(ps, p); 1649 ret = proc_ioctl_default(ps, p);
1650 break; 1650 break;
1651 } 1651 }