drivers/net: 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: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
committed by
Jeff Garzik
parent
b514f6b6da
commit
b39d66a81f
@@ -183,7 +183,7 @@ static void smc911x_reset(struct net_device *dev)
|
||||
unsigned int reg, timeout=0, resets=1;
|
||||
unsigned long flags;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__);
|
||||
|
||||
/* Take out of PM setting first */
|
||||
if ((SMC_GET_PMT_CTRL(lp) & PMT_CTRL_READY_) == 0) {
|
||||
@@ -272,7 +272,7 @@ static void smc911x_enable(struct net_device *dev)
|
||||
unsigned mask, cfg, cr;
|
||||
unsigned long flags;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__);
|
||||
|
||||
SMC_SET_MAC_ADDR(lp, dev->dev_addr);
|
||||
|
||||
@@ -329,7 +329,7 @@ static void smc911x_shutdown(struct net_device *dev)
|
||||
unsigned cr;
|
||||
unsigned long flags;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", CARDNAME, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", CARDNAME, __func__);
|
||||
|
||||
/* Disable IRQ's */
|
||||
SMC_SET_INT_EN(lp, 0);
|
||||
@@ -348,7 +348,7 @@ static inline void smc911x_drop_pkt(struct net_device *dev)
|
||||
struct smc911x_local *lp = netdev_priv(dev);
|
||||
unsigned int fifo_count, timeout, reg;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC | SMC_DEBUG_RX, "%s: --> %s\n", CARDNAME, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC | SMC_DEBUG_RX, "%s: --> %s\n", CARDNAME, __func__);
|
||||
fifo_count = SMC_GET_RX_FIFO_INF(lp) & 0xFFFF;
|
||||
if (fifo_count <= 4) {
|
||||
/* Manually dump the packet data */
|
||||
@@ -382,7 +382,7 @@ static inline void smc911x_rcv(struct net_device *dev)
|
||||
unsigned char *data;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC | SMC_DEBUG_RX, "%s: --> %s\n",
|
||||
dev->name, __FUNCTION__);
|
||||
dev->name, __func__);
|
||||
status = SMC_GET_RX_STS_FIFO(lp);
|
||||
DBG(SMC_DEBUG_RX, "%s: Rx pkt len %d status 0x%08x \n",
|
||||
dev->name, (status & 0x3fff0000) >> 16, status & 0xc000ffff);
|
||||
@@ -460,7 +460,7 @@ static void smc911x_hardware_send_pkt(struct net_device *dev)
|
||||
unsigned char *buf;
|
||||
unsigned long flags;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC | SMC_DEBUG_TX, "%s: --> %s\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC | SMC_DEBUG_TX, "%s: --> %s\n", dev->name, __func__);
|
||||
BUG_ON(lp->pending_tx_skb == NULL);
|
||||
|
||||
skb = lp->pending_tx_skb;
|
||||
@@ -524,7 +524,7 @@ static int smc911x_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
unsigned long flags;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC | SMC_DEBUG_TX, "%s: --> %s\n",
|
||||
dev->name, __FUNCTION__);
|
||||
dev->name, __func__);
|
||||
|
||||
BUG_ON(lp->pending_tx_skb != NULL);
|
||||
|
||||
@@ -596,7 +596,7 @@ static void smc911x_tx(struct net_device *dev)
|
||||
unsigned int tx_status;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC | SMC_DEBUG_TX, "%s: --> %s\n",
|
||||
dev->name, __FUNCTION__);
|
||||
dev->name, __func__);
|
||||
|
||||
/* Collect the TX status */
|
||||
while (((SMC_GET_TX_FIFO_INF(lp) & TX_FIFO_INF_TSUSED_) >> 16) != 0) {
|
||||
@@ -647,7 +647,7 @@ static int smc911x_phy_read(struct net_device *dev, int phyaddr, int phyreg)
|
||||
SMC_GET_MII(lp, phyreg, phyaddr, phydata);
|
||||
|
||||
DBG(SMC_DEBUG_MISC, "%s: phyaddr=0x%x, phyreg=0x%02x, phydata=0x%04x\n",
|
||||
__FUNCTION__, phyaddr, phyreg, phydata);
|
||||
__func__, phyaddr, phyreg, phydata);
|
||||
return phydata;
|
||||
}
|
||||
|
||||
@@ -661,7 +661,7 @@ static void smc911x_phy_write(struct net_device *dev, int phyaddr, int phyreg,
|
||||
struct smc911x_local *lp = netdev_priv(dev);
|
||||
|
||||
DBG(SMC_DEBUG_MISC, "%s: phyaddr=0x%x, phyreg=0x%x, phydata=0x%x\n",
|
||||
__FUNCTION__, phyaddr, phyreg, phydata);
|
||||
__func__, phyaddr, phyreg, phydata);
|
||||
|
||||
SMC_SET_MII(lp, phyreg, phyaddr, phydata);
|
||||
}
|
||||
@@ -676,7 +676,7 @@ static void smc911x_phy_detect(struct net_device *dev)
|
||||
int phyaddr;
|
||||
unsigned int cfg, id1, id2;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__);
|
||||
|
||||
lp->phy_type = 0;
|
||||
|
||||
@@ -746,7 +746,7 @@ static int smc911x_phy_fixed(struct net_device *dev)
|
||||
int phyaddr = lp->mii.phy_id;
|
||||
int bmcr;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__);
|
||||
|
||||
/* Enter Link Disable state */
|
||||
SMC_GET_PHY_BMCR(lp, phyaddr, bmcr);
|
||||
@@ -793,7 +793,7 @@ static int smc911x_phy_reset(struct net_device *dev, int phy)
|
||||
unsigned long flags;
|
||||
unsigned int reg;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s()\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s()\n", dev->name, __func__);
|
||||
|
||||
spin_lock_irqsave(&lp->lock, flags);
|
||||
reg = SMC_GET_PMT_CTRL(lp);
|
||||
@@ -852,7 +852,7 @@ static void smc911x_phy_check_media(struct net_device *dev, int init)
|
||||
int phyaddr = lp->mii.phy_id;
|
||||
unsigned int bmcr, cr;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__);
|
||||
|
||||
if (mii_check_media(&lp->mii, netif_msg_link(lp), init)) {
|
||||
/* duplex state has changed */
|
||||
@@ -892,7 +892,7 @@ static void smc911x_phy_configure(struct work_struct *work)
|
||||
int status;
|
||||
unsigned long flags;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s()\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s()\n", dev->name, __func__);
|
||||
|
||||
/*
|
||||
* We should not be called if phy_type is zero.
|
||||
@@ -985,7 +985,7 @@ static void smc911x_phy_interrupt(struct net_device *dev)
|
||||
int phyaddr = lp->mii.phy_id;
|
||||
int status;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__);
|
||||
|
||||
if (lp->phy_type == 0)
|
||||
return;
|
||||
@@ -1013,7 +1013,7 @@ static irqreturn_t smc911x_interrupt(int irq, void *dev_id)
|
||||
unsigned int rx_overrun=0, cr, pkts;
|
||||
unsigned long flags;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__);
|
||||
|
||||
spin_lock_irqsave(&lp->lock, flags);
|
||||
|
||||
@@ -1186,7 +1186,7 @@ smc911x_tx_dma_irq(int dma, void *data)
|
||||
struct sk_buff *skb = lp->current_tx_skb;
|
||||
unsigned long flags;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__);
|
||||
|
||||
DBG(SMC_DEBUG_TX | SMC_DEBUG_DMA, "%s: TX DMA irq handler\n", dev->name);
|
||||
/* Clear the DMA interrupt sources */
|
||||
@@ -1222,7 +1222,7 @@ smc911x_rx_dma_irq(int dma, void *data)
|
||||
unsigned long flags;
|
||||
unsigned int pkts;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__);
|
||||
DBG(SMC_DEBUG_RX | SMC_DEBUG_DMA, "%s: RX DMA irq handler\n", dev->name);
|
||||
/* Clear the DMA interrupt sources */
|
||||
SMC_DMA_ACK_IRQ(dev, dma);
|
||||
@@ -1270,7 +1270,7 @@ static void smc911x_timeout(struct net_device *dev)
|
||||
int status, mask;
|
||||
unsigned long flags;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__);
|
||||
|
||||
spin_lock_irqsave(&lp->lock, flags);
|
||||
status = SMC_GET_INT(lp);
|
||||
@@ -1308,7 +1308,7 @@ static void smc911x_set_multicast_list(struct net_device *dev)
|
||||
unsigned int mcr, update_multicast = 0;
|
||||
unsigned long flags;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__);
|
||||
|
||||
spin_lock_irqsave(&lp->lock, flags);
|
||||
SMC_GET_MAC_CR(lp, mcr);
|
||||
@@ -1410,7 +1410,7 @@ smc911x_open(struct net_device *dev)
|
||||
{
|
||||
struct smc911x_local *lp = netdev_priv(dev);
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__);
|
||||
|
||||
/*
|
||||
* Check that the address is valid. If its not, refuse
|
||||
@@ -1418,7 +1418,7 @@ smc911x_open(struct net_device *dev)
|
||||
* address using ifconfig eth0 hw ether xx:xx:xx:xx:xx:xx
|
||||
*/
|
||||
if (!is_valid_ether_addr(dev->dev_addr)) {
|
||||
PRINTK("%s: no valid ethernet hw addr\n", __FUNCTION__);
|
||||
PRINTK("%s: no valid ethernet hw addr\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -1447,7 +1447,7 @@ static int smc911x_close(struct net_device *dev)
|
||||
{
|
||||
struct smc911x_local *lp = netdev_priv(dev);
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__);
|
||||
|
||||
netif_stop_queue(dev);
|
||||
netif_carrier_off(dev);
|
||||
@@ -1481,7 +1481,7 @@ smc911x_ethtool_getsettings(struct net_device *dev, struct ethtool_cmd *cmd)
|
||||
int ret, status;
|
||||
unsigned long flags;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__);
|
||||
cmd->maxtxpkt = 1;
|
||||
cmd->maxrxpkt = 1;
|
||||
|
||||
@@ -1619,7 +1619,7 @@ static int smc911x_ethtool_wait_eeprom_ready(struct net_device *dev)
|
||||
for(timeout=10;(e2p_cmd & E2P_CMD_EPC_BUSY_) && timeout; timeout--) {
|
||||
if (e2p_cmd & E2P_CMD_EPC_TIMEOUT_) {
|
||||
PRINTK("%s: %s timeout waiting for EEPROM to respond\n",
|
||||
dev->name, __FUNCTION__);
|
||||
dev->name, __func__);
|
||||
return -EFAULT;
|
||||
}
|
||||
mdelay(1);
|
||||
@@ -1627,7 +1627,7 @@ static int smc911x_ethtool_wait_eeprom_ready(struct net_device *dev)
|
||||
}
|
||||
if (timeout == 0) {
|
||||
PRINTK("%s: %s timeout waiting for EEPROM CMD not busy\n",
|
||||
dev->name, __FUNCTION__);
|
||||
dev->name, __func__);
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
return 0;
|
||||
@@ -1740,7 +1740,7 @@ static int __init smc911x_findirq(struct net_device *dev)
|
||||
int timeout = 20;
|
||||
unsigned long cookie;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "--> %s\n", __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "--> %s\n", __func__);
|
||||
|
||||
cookie = probe_irq_on();
|
||||
|
||||
@@ -1806,7 +1806,7 @@ static int __init smc911x_probe(struct net_device *dev)
|
||||
const char *version_string;
|
||||
unsigned long irq_flags;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__);
|
||||
|
||||
/* First, see if the endian word is recognized */
|
||||
val = SMC_GET_BYTE_TEST(lp);
|
||||
@@ -2056,7 +2056,7 @@ static int smc911x_drv_probe(struct platform_device *pdev)
|
||||
unsigned int *addr;
|
||||
int ret;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "--> %s\n", __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "--> %s\n", __func__);
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (!res) {
|
||||
ret = -ENODEV;
|
||||
@@ -2127,7 +2127,7 @@ static int smc911x_drv_remove(struct platform_device *pdev)
|
||||
struct smc911x_local *lp = netdev_priv(ndev);
|
||||
struct resource *res;
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "--> %s\n", __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "--> %s\n", __func__);
|
||||
platform_set_drvdata(pdev, NULL);
|
||||
|
||||
unregister_netdev(ndev);
|
||||
@@ -2157,7 +2157,7 @@ static int smc911x_drv_suspend(struct platform_device *dev, pm_message_t state)
|
||||
struct net_device *ndev = platform_get_drvdata(dev);
|
||||
struct smc911x_local *lp = netdev_priv(ndev);
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "--> %s\n", __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "--> %s\n", __func__);
|
||||
if (ndev) {
|
||||
if (netif_running(ndev)) {
|
||||
netif_device_detach(ndev);
|
||||
@@ -2175,7 +2175,7 @@ static int smc911x_drv_resume(struct platform_device *dev)
|
||||
{
|
||||
struct net_device *ndev = platform_get_drvdata(dev);
|
||||
|
||||
DBG(SMC_DEBUG_FUNC, "--> %s\n", __FUNCTION__);
|
||||
DBG(SMC_DEBUG_FUNC, "--> %s\n", __func__);
|
||||
if (ndev) {
|
||||
struct smc911x_local *lp = netdev_priv(ndev);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user