Merge branch 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / arch / ppc / 8xx_io / fec.c

diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c
index d7b7ba93e1dea15ed40affa83656f210755a4b62..2c604d4f6e8b40f56c26767fcd5c2275b608b2ca 100644 (file)
--- a/arch/ppc/8xx_io/fec.c
+++ b/arch/ppc/8xx_io/fec.c
@@ -519,7 +519,7 @@ fec_enet_interrupt(int irq, void *dev_id)
 #ifdef CONFIG_USE_MDIO
                        fec_enet_mii(dev);
 #else
-printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__,__LINE__,__FUNCTION__);
+printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__, __LINE__, __func__);
 #endif /* CONFIG_USE_MDIO */
                }
 
@@ -1440,7 +1440,7 @@ irqreturn_t mii_link_interrupt(int irq, void * dev_id)
                fecp->fec_ecntrl = ecntrl;      /* restore old settings */
        }
 #else
-printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__,__LINE__,__FUNCTION__);
+printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__, __LINE__, __func__);
 #endif /* CONFIG_USE_MDIO */
 
 #ifndef CONFIG_RPXCLASSIC