Skip to content

L
linux
Commit 4a9bdcd1 authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds
Browse files
Options

[PATCH] numerous __FUNCTION__ pasting fixes

parent b8ba9914
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 89 deletions
drivers/atm/firestream.c
View file @ 4a9bdcd1
...@@ -330,8 +330,8 @@ MODULE_PARM(fs_keystream, "i"); ...@@ -330,8 +330,8 @@ MODULE_PARM(fs_keystream, "i");
#define FS_DEBUG_QSIZE 0x00001000 #define FS_DEBUG_QSIZE 0x00001000
#define func_enter() fs_dprintk (FS_DEBUG_FLOW, "fs: enter " __FUNCTION__ "\n") #define func_enter() fs_dprintk (FS_DEBUG_FLOW, "fs: enter %s\n", __FUNCTION__)
#define func_exit() fs_dprintk (FS_DEBUG_FLOW, "fs: exit " __FUNCTION__ "\n") #define func_exit() fs_dprintk (FS_DEBUG_FLOW, "fs: exit %s\n", __FUNCTION__)
struct fs_dev *fs_boards = NULL; struct fs_dev *fs_boards = NULL;
......
drivers/char/generic_serial.c
View file @ 4a9bdcd1
...@@ -41,8 +41,8 @@ static int gs_debug; ...@@ -41,8 +41,8 @@ static int gs_debug;
#define gs_dprintk(f, str...) /* nothing */ #define gs_dprintk(f, str...) /* nothing */
#endif #endif
#define func_enter() gs_dprintk (GS_DEBUG_FLOW, "gs: enter " __FUNCTION__ "\n") #define func_enter() gs_dprintk (GS_DEBUG_FLOW, "gs: enter %s\n", __FUNCTION__)
#define func_exit() gs_dprintk (GS_DEBUG_FLOW, "gs: exit " __FUNCTION__ "\n") #define func_exit() gs_dprintk (GS_DEBUG_FLOW, "gs: exit %s\n", __FUNCTION__)
#if NEW_WRITE_LOCKING #if NEW_WRITE_LOCKING
#define DECL /* Nothing */ #define DECL /* Nothing */
......
drivers/char/sx.c
View file @ 4a9bdcd1
...@@ -404,11 +404,11 @@ static struct real_driver sx_real_driver = { ...@@ -404,11 +404,11 @@ static struct real_driver sx_real_driver = {
#define func_enter() sx_dprintk (SX_DEBUG_FLOW, "sx: enter " __FUNCTION__ "\n") #define func_enter() sx_dprintk (SX_DEBUG_FLOW, "sx: enter %s\b",__FUNCTION__)
#define func_exit() sx_dprintk (SX_DEBUG_FLOW, "sx: exit " __FUNCTION__ "\n") #define func_exit() sx_dprintk (SX_DEBUG_FLOW, "sx: exit %s\n", __FUNCTION__)
#define func_enter2() sx_dprintk (SX_DEBUG_FLOW, "sx: enter " __FUNCTION__ \ #define func_enter2() sx_dprintk (SX_DEBUG_FLOW, "sx: enter %s (port %d)\n", \
"(port %d)\n", port->line) __FUNCTION__, port->line)
......
drivers/media/video/cpia.h
View file @ 4a9bdcd1
...@@ -379,7 +379,7 @@ void cpia_unregister_camera(struct cam_data *cam); ...@@ -379,7 +379,7 @@ void cpia_unregister_camera(struct cam_data *cam);
#define ERROR_FLICKER_BELOW_MIN_EXP 0x01 /*flicker exposure got below minimum exposure */ #define ERROR_FLICKER_BELOW_MIN_EXP 0x01 /*flicker exposure got below minimum exposure */
#define ALOG(lineno,fmt,args...) printk(fmt,lineno,##args) #define ALOG(lineno,fmt,args...) printk(fmt,lineno,##args)
#define LOG(fmt,args...) ALOG((__LINE__),KERN_INFO __FILE__":"__FUNCTION__"(%d):"fmt,##args) #define LOG(fmt,args...) ALOG((__LINE__),KERN_INFO __FILE__":%s(%d):"fmt, __FUNCTION__, ##args)
#ifdef _CPIA_DEBUG_ #ifdef _CPIA_DEBUG_
#define ADBG(lineno,fmt,args...) printk(fmt, jiffies, lineno, ##args) #define ADBG(lineno,fmt,args...) printk(fmt, jiffies, lineno, ##args)
......
drivers/media/video/cpia_usb.c
View file @ 4a9bdcd1
...@@ -167,7 +167,7 @@ static void cpia_usb_complete(struct urb *urb) ...@@ -167,7 +167,7 @@ static void cpia_usb_complete(struct urb *urb)
/* resubmit */ /* resubmit */
urb->dev = ucpia->dev; urb->dev = ucpia->dev;
if ((i = usb_submit_urb(urb, GFP_ATOMIC)) != 0) if ((i = usb_submit_urb(urb, GFP_ATOMIC)) != 0)
printk(KERN_ERR __FUNCTION__ ": usb_submit_urb ret %d\n", i); printk(KERN_ERR "%s: usb_submit_urb ret %d\n", __FUNCTION__, i);
} }
static int cpia_usb_open(void *privdata) static int cpia_usb_open(void *privdata)
......
drivers/net/gt96100eth.c
View file @ 4a9bdcd1
...@@ -267,7 +267,7 @@ read_MII(int phy_addr, u32 reg) ...@@ -267,7 +267,7 @@ read_MII(int phy_addr, u32 reg)
gt96100_delay(1); gt96100_delay(1);
if (--timedout == 0) { if (--timedout == 0) {
printk(KERN_ERR __FUNCTION__ ": busy timeout!!\n"); printk(KERN_ERR "%s: busy timeout!!\n", __FUNCTION__);
return -ENODEV; return -ENODEV;
} }
} }
...@@ -281,7 +281,7 @@ read_MII(int phy_addr, u32 reg) ...@@ -281,7 +281,7 @@ read_MII(int phy_addr, u32 reg)
gt96100_delay(1); gt96100_delay(1);
if (--timedout == 0) { if (--timedout == 0) {
printk(KERN_ERR __FUNCTION__ ": timeout!!\n"); printk(KERN_ERR "%s: timeout!!\n", __FUNCTION__);
return -ENODEV; return -ENODEV;
} }
} }
...@@ -333,7 +333,7 @@ write_MII(int phy_addr, u32 reg, u16 data) ...@@ -333,7 +333,7 @@ write_MII(int phy_addr, u32 reg, u16 data)
gt96100_delay(1); gt96100_delay(1);
if (--timedout == 0) { if (--timedout == 0) {
printk(KERN_ERR __FUNCTION__ ": busy timeout!!\n"); printk(KERN_ERR "%s: busy timeout!!\n", __FUNCTION__);
return -1; return -1;
} }
} }
...@@ -350,7 +350,7 @@ dump_tx_ring(struct net_device *dev) ...@@ -350,7 +350,7 @@ dump_tx_ring(struct net_device *dev)
struct gt96100_private *gp = (struct gt96100_private *)dev->priv; struct gt96100_private *gp = (struct gt96100_private *)dev->priv;
int i; int i;
dbg(0, __FUNCTION__ ": txno/txni/cnt=%d/%d/%d\n", dbg(0, "%s: txno/txni/cnt=%d/%d/%d\n", __FUNCTION__,
gp->tx_next_out, gp->tx_next_in, gp->tx_count); gp->tx_next_out, gp->tx_next_in, gp->tx_count);
for (i=0; i<TX_RING_SIZE; i++) for (i=0; i<TX_RING_SIZE; i++)
...@@ -363,7 +363,7 @@ dump_rx_ring(struct net_device *dev) ...@@ -363,7 +363,7 @@ dump_rx_ring(struct net_device *dev)
struct gt96100_private *gp = (struct gt96100_private *)dev->priv; struct gt96100_private *gp = (struct gt96100_private *)dev->priv;
int i; int i;
dbg(0, __FUNCTION__ ": rxno=%d\n", gp->rx_next_out); dbg(0, "%s: rxno=%d\n", __FUNCTION__, gp->rx_next_out);
for (i=0; i<RX_RING_SIZE; i++) for (i=0; i<RX_RING_SIZE; i++)
dump_rx_desc(0, dev, i); dump_rx_desc(0, dev, i);
...@@ -414,9 +414,8 @@ dump_skb(int dbg_lvl, struct net_device *dev, struct sk_buff *skb) ...@@ -414,9 +414,8 @@ dump_skb(int dbg_lvl, struct net_device *dev, struct sk_buff *skb)
unsigned char* skbdata; unsigned char* skbdata;
if (dbg_lvl <= GT96100_DEBUG) { if (dbg_lvl <= GT96100_DEBUG) {
dbg(dbg_lvl, __FUNCTION__ dbg(dbg_lvl, "%s: skb=%p, skb->data=%p, skb->len=%d\n",
": skb=%p, skb->data=%p, skb->len=%d\n", __FUNCTION__, skb, skb->data, skb->len);
skb, skb->data, skb->len);
skbdata = (unsigned char*)KSEG1ADDR(skb->data); skbdata = (unsigned char*)KSEG1ADDR(skb->data);
...@@ -446,11 +445,11 @@ gt96100_add_hash_entry(struct net_device *dev, unsigned char* addr) ...@@ -446,11 +445,11 @@ gt96100_add_hash_entry(struct net_device *dev, unsigned char* addr)
tblEntry1 |= (u32)addr[4] << 11; tblEntry1 |= (u32)addr[4] << 11;
tblEntry1 |= (u32)addr[3] << 19; tblEntry1 |= (u32)addr[3] << 19;
tblEntry1 |= ((u32)addr[2] & 0x1f) << 27; tblEntry1 |= ((u32)addr[2] & 0x1f) << 27;
dbg(3, __FUNCTION__ ": tblEntry1=%x\n", tblEntry1); dbg(3, "%s: tblEntry1=%x\n", __FUNCTION__, tblEntry1);
tblEntry0 = ((u32)addr[2] >> 5) & 0x07; tblEntry0 = ((u32)addr[2] >> 5) & 0x07;
tblEntry0 |= (u32)addr[1] << 3; tblEntry0 |= (u32)addr[1] << 3;
tblEntry0 |= (u32)addr[0] << 11; tblEntry0 |= (u32)addr[0] << 11;
dbg(3, __FUNCTION__ ": tblEntry0=%x\n", tblEntry0); dbg(3, "%s: tblEntry0=%x\n", __FUNCTION__, tblEntry0);
#if 0 #if 0
...@@ -464,7 +463,7 @@ gt96100_add_hash_entry(struct net_device *dev, unsigned char* addr) ...@@ -464,7 +463,7 @@ gt96100_add_hash_entry(struct net_device *dev, unsigned char* addr)
((ctmp&0x20)<<1) | ((ctmp&0x40)>>1); ((ctmp&0x20)<<1) | ((ctmp&0x40)>>1);
} }
dump_hw_addr(3, dev, __FUNCTION__ ": nib swap/invt addr=", hash_ea); dump_hw_addr(3, dev, "%s: nib swap/invt addr=", __FUNCTION__, hash_ea);
if (gp->hash_mode == 0) { if (gp->hash_mode == 0) {
hashResult = ((u16)hash_ea[0] & 0xfc) << 7; hashResult = ((u16)hash_ea[0] & 0xfc) << 7;
...@@ -478,19 +477,19 @@ gt96100_add_hash_entry(struct net_device *dev, unsigned char* addr) ...@@ -478,19 +477,19 @@ gt96100_add_hash_entry(struct net_device *dev, unsigned char* addr)
return -1; // don't support hash mode 1 return -1; // don't support hash mode 1
} }
dbg(3, __FUNCTION__ ": hashResult=%x\n", hashResult); dbg(3, "%s: hashResult=%x\n", __FUNCTION__, hashResult);
tblEntryAddr = tblEntryAddr =
(u32 *)(&gp->hash_table[((u32)hashResult & 0x7ff) << 3]); (u32 *)(&gp->hash_table[((u32)hashResult & 0x7ff) << 3]);
dbg(3, __FUNCTION__ ": tblEntryAddr=%p\n", tblEntryAddr); dbg(3, "%s: tblEntryAddr=%p\n", tblEntryAddr, __FUNCTION__);
for (i=0; i<HASH_HOP_NUMBER; i++) { for (i=0; i<HASH_HOP_NUMBER; i++) {
if ((*tblEntryAddr & hteValid) && if ((*tblEntryAddr & hteValid) &&
!(*tblEntryAddr & hteSkip)) { !(*tblEntryAddr & hteSkip)) {
// This entry is already occupied, go to next entry // This entry is already occupied, go to next entry
tblEntryAddr += 2; tblEntryAddr += 2;
dbg(3, __FUNCTION__ ": skipping to %p\n", dbg(3, "%s: skipping to %p\n", __FUNCTION__,
tblEntryAddr); tblEntryAddr);
} else { } else {
memset(tblEntryAddr, 0, 8); memset(tblEntryAddr, 0, 8);
...@@ -501,7 +500,7 @@ gt96100_add_hash_entry(struct net_device *dev, unsigned char* addr) ...@@ -501,7 +500,7 @@ gt96100_add_hash_entry(struct net_device *dev, unsigned char* addr)
} }
if (i >= HASH_HOP_NUMBER) { if (i >= HASH_HOP_NUMBER) {
err(__FUNCTION__ ": expired!\n"); err("%s: expired!\n", __FUNCTION__);
return -1; // Couldn't find an unused entry return -1; // Couldn't find an unused entry
} }
...@@ -563,7 +562,7 @@ abort(struct net_device *dev, u32 abort_bits) ...@@ -563,7 +562,7 @@ abort(struct net_device *dev, u32 abort_bits)
struct gt96100_private *gp = (struct gt96100_private *)dev->priv; struct gt96100_private *gp = (struct gt96100_private *)dev->priv;
int timedout = 100; // wait up to 100 msec for hard stop to complete int timedout = 100; // wait up to 100 msec for hard stop to complete
dbg(3, __FUNCTION__ "\n"); dbg(3, "%s\n", __FUNCTION__);
// Return if neither Rx or Tx abort bits are set // Return if neither Rx or Tx abort bits are set
if (!(abort_bits & (sdcmrAR | sdcmrAT))) if (!(abort_bits & (sdcmrAR | sdcmrAT)))
...@@ -577,7 +576,7 @@ abort(struct net_device *dev, u32 abort_bits) ...@@ -577,7 +576,7 @@ abort(struct net_device *dev, u32 abort_bits)
// abort any Rx/Tx DMA immediately // abort any Rx/Tx DMA immediately
GT96100ETH_WRITE(gp, GT96100_ETH_SDMA_COMM, abort_bits); GT96100ETH_WRITE(gp, GT96100_ETH_SDMA_COMM, abort_bits);
dbg(3, __FUNCTION__ ": SDMA comm = %x\n", dbg(3, "%s: SDMA comm = %x\n", __FUNCTION__,
GT96100ETH_READ(gp, GT96100_ETH_SDMA_COMM)); GT96100ETH_READ(gp, GT96100_ETH_SDMA_COMM));
// wait for abort to complete // wait for abort to complete
...@@ -586,7 +585,7 @@ abort(struct net_device *dev, u32 abort_bits) ...@@ -586,7 +585,7 @@ abort(struct net_device *dev, u32 abort_bits)
gt96100_delay(1); gt96100_delay(1);
if (--timedout == 0) { if (--timedout == 0) {
err(__FUNCTION__ ": timeout!!\n"); err("%s: timeout!!\n", __FUNCTION__);
break; break;
} }
} }
...@@ -600,7 +599,7 @@ hard_stop(struct net_device *dev) ...@@ -600,7 +599,7 @@ hard_stop(struct net_device *dev)
{ {
struct gt96100_private *gp = (struct gt96100_private *)dev->priv; struct gt96100_private *gp = (struct gt96100_private *)dev->priv;
dbg(3, __FUNCTION__ "\n"); dbg(3, "%s\n", __FUNCTION__);
disable_ether_irq(dev); disable_ether_irq(dev);
...@@ -712,8 +711,7 @@ gt96100_probe1(int port_num) ...@@ -712,8 +711,7 @@ gt96100_probe1(int port_num)
struct net_device *dev = NULL; struct net_device *dev = NULL;
if (gtif->irq < 0) { if (gtif->irq < 0) {
printk(KERN_ERR __FUNCTION__ printk(KERN_ERR "%s: irq unknown - probing not supported\n", __FUNCTION_);
": irq unknown - probing not supported\n");
return -ENODEV; return -ENODEV;
} }
...@@ -737,13 +735,12 @@ gt96100_probe1(int port_num) ...@@ -737,13 +735,12 @@ gt96100_probe1(int port_num)
// probe for the external PHY // probe for the external PHY
if ((phy_id1 = read_MII(phy_addr, 2)) <= 0 || if ((phy_id1 = read_MII(phy_addr, 2)) <= 0 ||
(phy_id2 = read_MII(phy_addr, 3)) <= 0) { (phy_id2 = read_MII(phy_addr, 3)) <= 0) {
printk(KERN_ERR __FUNCTION__ printk(KERN_ERR "%s: no PHY found on MII%d\n", __FUNCTION__, port_num);
": no PHY found on MII%d\n", port_num);
return -ENODEV; return -ENODEV;
} }
if (!request_region(gtif->iobase, GT96100_ETH_IO_SIZE, "GT96100ETH")) { if (!request_region(gtif->iobase, GT96100_ETH_IO_SIZE, "GT96100ETH")) {
printk(KERN_ERR __FUNCTION__ ": request_region failed\n"); printk(KERN_ERR "%s: request_region failed\n", __FUNCTION__);
return -EBUSY; return -EBUSY;
} }
...@@ -756,7 +753,7 @@ gt96100_probe1(int port_num) ...@@ -756,7 +753,7 @@ gt96100_probe1(int port_num)
dev->irq = gtif->irq; dev->irq = gtif->irq;
if ((retval = parse_mac_addr(dev, gtif->mac_str))) { if ((retval = parse_mac_addr(dev, gtif->mac_str))) {
err(__FUNCTION__ ": MAC address parse failed\n"); err("%s: MAC address parse failed\n", __FUNCTION__);
retval = -EINVAL; retval = -EINVAL;
goto free_region; goto free_region;
} }
...@@ -820,7 +817,7 @@ gt96100_probe1(int port_num) ...@@ -820,7 +817,7 @@ gt96100_probe1(int port_num)
} }
} }
dbg(3, __FUNCTION__ ": rx_ring=%p, tx_ring=%p\n", dbg(3, "%s: rx_ring=%p, tx_ring=%p\n", __FUNCTION__,
gp->rx_ring, gp->tx_ring); gp->rx_ring, gp->tx_ring);
// Allocate Rx Hash Table // Allocate Rx Hash Table
...@@ -837,7 +834,7 @@ gt96100_probe1(int port_num) ...@@ -837,7 +834,7 @@ gt96100_probe1(int port_num)
} }
} }
dbg(3, __FUNCTION__ ": hash=%p\n", gp->hash_table); dbg(3, "%s: hash=%p\n", __FUNCTION__, gp->hash_table);
spin_lock_init(&gp->lock); spin_lock_init(&gp->lock);
...@@ -860,7 +857,7 @@ gt96100_probe1(int port_num) ...@@ -860,7 +857,7 @@ gt96100_probe1(int port_num)
if (dev->priv != NULL) if (dev->priv != NULL)
kfree (dev->priv); kfree (dev->priv);
kfree (dev); kfree (dev);
err(__FUNCTION__ " failed. Returns %d\n", retval); err("%s failed. Returns %d\n", __FUNCTION__, retval);
return retval; return retval;
} }
...@@ -967,10 +964,10 @@ gt96100_init(struct net_device *dev) ...@@ -967,10 +964,10 @@ gt96100_init(struct net_device *dev)
u32 tmp; u32 tmp;
u16 mii_reg; u16 mii_reg;
dbg(3, __FUNCTION__ ": dev=%p\n", dev); dbg(3, "%s: dev=%p\n", __FUNCTION__, dev);
dbg(3, __FUNCTION__ ": scs10_lo=%4x, scs10_hi=%4x\n", dbg(3, "%s: scs10_lo=%4x, scs10_hi=%4x\n", __FUNCTION__,
GT96100_READ(0x8), GT96100_READ(0x10)); GT96100_READ(0x8), GT96100_READ(0x10));
dbg(3, __FUNCTION__ ": scs32_lo=%4x, scs32_hi=%4x\n", dbg(3, "%s: scs32_lo=%4x, scs32_hi=%4x\n", __FUNCTION__,
GT96100_READ(0x18), GT96100_READ(0x20)); GT96100_READ(0x18), GT96100_READ(0x20));
// Stop and disable Port // Stop and disable Port
...@@ -985,7 +982,7 @@ gt96100_init(struct net_device *dev) ...@@ -985,7 +982,7 @@ gt96100_init(struct net_device *dev)
tmp |= (1<<31); tmp |= (1<<31);
#endif #endif
GT96100_WRITE(GT96100_CIU_ARBITER_CONFIG, tmp); GT96100_WRITE(GT96100_CIU_ARBITER_CONFIG, tmp);
dbg(3, __FUNCTION__ ": CIU Config=%x/%x\n", dbg(3, "%s: CIU Config=%x/%x\n", __FUNCTION__,
tmp, GT96100_READ(GT96100_CIU_ARBITER_CONFIG)); tmp, GT96100_READ(GT96100_CIU_ARBITER_CONFIG));
// Set routing. // Set routing.
...@@ -1010,19 +1007,19 @@ gt96100_init(struct net_device *dev) ...@@ -1010,19 +1007,19 @@ gt96100_init(struct net_device *dev)
gt96100_add_hash_entry(dev, dev->dev_addr); gt96100_add_hash_entry(dev, dev->dev_addr);
// Set-up DMA ptr to hash table // Set-up DMA ptr to hash table
GT96100ETH_WRITE(gp, GT96100_ETH_HASH_TBL_PTR, gp->hash_table_dma); GT96100ETH_WRITE(gp, GT96100_ETH_HASH_TBL_PTR, gp->hash_table_dma);
dbg(3, __FUNCTION__ ": Hash Tbl Ptr=%x\n", dbg(3, "%s: Hash Tbl Ptr=%x\n", __FUNCTION__,
GT96100ETH_READ(gp, GT96100_ETH_HASH_TBL_PTR)); GT96100ETH_READ(gp, GT96100_ETH_HASH_TBL_PTR));
// Setup Tx // Setup Tx
reset_tx(dev); reset_tx(dev);
dbg(3, __FUNCTION__ ": Curr Tx Desc Ptr0=%x\n", dbg(3, "%s: Curr Tx Desc Ptr0=%x\n", __FUNCTION__,
GT96100ETH_READ(gp, GT96100_ETH_CURR_TX_DESC_PTR0)); GT96100ETH_READ(gp, GT96100_ETH_CURR_TX_DESC_PTR0));
// Setup Rx // Setup Rx
reset_rx(dev); reset_rx(dev);
dbg(3, __FUNCTION__ ": 1st/Curr Rx Desc Ptr0=%x/%x\n", dbg(3, "%s: 1st/Curr Rx Desc Ptr0=%x/%x\n", __FUNCTION__,
GT96100ETH_READ(gp, GT96100_ETH_1ST_RX_DESC_PTR0), GT96100ETH_READ(gp, GT96100_ETH_1ST_RX_DESC_PTR0),
GT96100ETH_READ(gp, GT96100_ETH_CURR_RX_DESC_PTR0)); GT96100ETH_READ(gp, GT96100_ETH_CURR_RX_DESC_PTR0));
...@@ -1034,7 +1031,7 @@ gt96100_init(struct net_device *dev) ...@@ -1034,7 +1031,7 @@ gt96100_init(struct net_device *dev)
mii_reg |= 2; /* enable mii interrupt */ mii_reg |= 2; /* enable mii interrupt */
write_MII(gp->phy_addr, 0x11, mii_reg); write_MII(gp->phy_addr, 0x11, mii_reg);
dbg(3, __FUNCTION__ ": PhyAD=%x\n", dbg(3, "%s: PhyAD=%x\n", __FUNCTION__,
GT96100_READ(GT96100_ETH_PHY_ADDR_REG)); GT96100_READ(GT96100_ETH_PHY_ADDR_REG));
// setup DMA // setup DMA
...@@ -1049,17 +1046,17 @@ gt96100_init(struct net_device *dev) ...@@ -1049,17 +1046,17 @@ gt96100_init(struct net_device *dev)
sdcrBLMR | sdcrBLMT | sdcrBLMR | sdcrBLMT |
(0xf<<sdcrRCBit) | sdcrRIFB | (3<<sdcrBSZBit)); (0xf<<sdcrRCBit) | sdcrRIFB | (3<<sdcrBSZBit));
#endif #endif
dbg(3, __FUNCTION__ ": SDMA Config=%x\n", dbg(3, "%s: SDMA Config=%x\n", __FUNCTION__,
GT96100ETH_READ(gp, GT96100_ETH_SDMA_CONFIG)); GT96100ETH_READ(gp, GT96100_ETH_SDMA_CONFIG));
// start Rx DMA // start Rx DMA
GT96100ETH_WRITE(gp, GT96100_ETH_SDMA_COMM, sdcmrERD); GT96100ETH_WRITE(gp, GT96100_ETH_SDMA_COMM, sdcmrERD);
dbg(3, __FUNCTION__ ": SDMA Comm=%x\n", dbg(3, "%s: SDMA Comm=%x\n", __FUNCTION__,
GT96100ETH_READ(gp, GT96100_ETH_SDMA_COMM)); GT96100ETH_READ(gp, GT96100_ETH_SDMA_COMM));
// enable this port (set hash size to 1/2K) // enable this port (set hash size to 1/2K)
GT96100ETH_WRITE(gp, GT96100_ETH_PORT_CONFIG, pcrEN | pcrHS); GT96100ETH_WRITE(gp, GT96100_ETH_PORT_CONFIG, pcrEN | pcrHS);
dbg(3, __FUNCTION__ ": Port Config=%x\n", dbg(3, "%s: Port Config=%x\n", __FUNCTION__,
GT96100ETH_READ(gp, GT96100_ETH_PORT_CONFIG)); GT96100ETH_READ(gp, GT96100_ETH_PORT_CONFIG));
/* /*
...@@ -1079,7 +1076,7 @@ gt96100_init(struct net_device *dev) ...@@ -1079,7 +1076,7 @@ gt96100_init(struct net_device *dev)
pcxrFCTL | pcxrFCTLen | pcxrFLP | pcxrFCTL | pcxrFCTLen | pcxrFLP |
pcxrPRIOrxOverride | pcxrMIBclrMode); pcxrPRIOrxOverride | pcxrMIBclrMode);
dbg(3, __FUNCTION__ ": Port Config Ext=%x\n", dbg(3, "%s: Port Config Ext=%x\n", __FUNCTION__,
GT96100ETH_READ(gp, GT96100_ETH_PORT_CONFIG_EXT)); GT96100ETH_READ(gp, GT96100_ETH_PORT_CONFIG_EXT));
netif_start_queue(dev); netif_start_queue(dev);
...@@ -1101,7 +1098,7 @@ gt96100_open(struct net_device *dev) ...@@ -1101,7 +1098,7 @@ gt96100_open(struct net_device *dev)
MOD_INC_USE_COUNT; MOD_INC_USE_COUNT;
dbg(2, __FUNCTION__ ": dev=%p\n", dev); dbg(2, "%s: dev=%p\n", __FUNCTION__, dev);
// Initialize and startup the GT-96100 ethernet port // Initialize and startup the GT-96100 ethernet port
if ((retval = gt96100_init(dev))) { if ((retval = gt96100_init(dev))) {
...@@ -1118,7 +1115,7 @@ gt96100_open(struct net_device *dev) ...@@ -1118,7 +1115,7 @@ gt96100_open(struct net_device *dev)
return retval; return retval;
} }
dbg(2, __FUNCTION__ ": Initialization done.\n"); dbg(2, "%s: Initialization done.\n", __FUNCTION__);
return 0; return 0;
} }
...@@ -1126,7 +1123,7 @@ gt96100_open(struct net_device *dev) ...@@ -1126,7 +1123,7 @@ gt96100_open(struct net_device *dev)
static int static int
gt96100_close(struct net_device *dev) gt96100_close(struct net_device *dev)
{ {
dbg(3, __FUNCTION__ ": dev=%p\n", dev); dbg(3, "%s: dev=%p\n", __FUNCTION__, dev);
// stop the device // stop the device
if (netif_device_present(dev)) { if (netif_device_present(dev)) {
...@@ -1152,7 +1149,7 @@ gt96100_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -1152,7 +1149,7 @@ gt96100_tx(struct sk_buff *skb, struct net_device *dev)
nextIn = gp->tx_next_in; nextIn = gp->tx_next_in;
dbg(3, __FUNCTION__ ": nextIn=%d\n", nextIn); dbg(3, "%s: nextIn=%d\n", __FUNCTION__, nextIn);
if (gp->tx_count >= TX_RING_SIZE) { if (gp->tx_count >= TX_RING_SIZE) {
warn("Tx Ring full, pkt dropped.\n"); warn("Tx Ring full, pkt dropped.\n");
...@@ -1162,14 +1159,14 @@ gt96100_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -1162,14 +1159,14 @@ gt96100_tx(struct sk_buff *skb, struct net_device *dev)
} }
if (!(gp->last_psr & psrLink)) { if (!(gp->last_psr & psrLink)) {
err(__FUNCTION__ ": Link down, pkt dropped.\n"); err("%s: Link down, pkt dropped.\n", __FUNCTION__);
gp->stats.tx_dropped++; gp->stats.tx_dropped++;
spin_unlock_irqrestore(&gp->lock, flags); spin_unlock_irqrestore(&gp->lock, flags);
return 1; return 1;
} }
if (dma32_to_cpu(gp->tx_ring[nextIn].cmdstat) & txOwn) { if (dma32_to_cpu(gp->tx_ring[nextIn].cmdstat) & txOwn) {
err(__FUNCTION__ ": device owns descriptor, pkt dropped.\n"); err("%s: device owns descriptor, pkt dropped.\n", __FUNCTION__);
gp->stats.tx_dropped++; gp->stats.tx_dropped++;
// stop the queue, so Tx timeout can fix it // stop the queue, so Tx timeout can fix it
netif_stop_queue(dev); netif_stop_queue(dev);
...@@ -1222,7 +1219,7 @@ gt96100_rx(struct net_device *dev, u32 status) ...@@ -1222,7 +1219,7 @@ gt96100_rx(struct net_device *dev, u32 status)
gt96100_rd_t *rd; gt96100_rd_t *rd;
u32 cmdstat; u32 cmdstat;
dbg(3, __FUNCTION__ ": dev=%p, status=%x\n", dev, status); dbg(3, "%s: dev=%p, status=%x\n", __FUNCTION__, dev, status);
cdp = (GT96100ETH_READ(gp, GT96100_ETH_1ST_RX_DESC_PTR0) cdp = (GT96100ETH_READ(gp, GT96100_ETH_1ST_RX_DESC_PTR0)
- gp->rx_ring_dma) / sizeof(gt96100_rd_t); - gp->rx_ring_dma) / sizeof(gt96100_rd_t);
...@@ -1237,7 +1234,7 @@ gt96100_rx(struct net_device *dev, u32 status) ...@@ -1237,7 +1234,7 @@ gt96100_rx(struct net_device *dev, u32 status)
rd = &gp->rx_ring[nextOut]; rd = &gp->rx_ring[nextOut];
cmdstat = dma32_to_cpu(rd->cmdstat); cmdstat = dma32_to_cpu(rd->cmdstat);
dbg(4, __FUNCTION__ ": Rx desc cmdstat=%x, nextOut=%d\n", dbg(4, "%s: Rx desc cmdstat=%x, nextOut=%d\n", __FUNCTION__,
cmdstat, nextOut); cmdstat, nextOut);
if (cmdstat & (u32)rxOwn) { if (cmdstat & (u32)rxOwn) {
...@@ -1279,8 +1276,7 @@ gt96100_rx(struct net_device *dev, u32 status) ...@@ -1279,8 +1276,7 @@ gt96100_rx(struct net_device *dev, u32 status)
* the deal with this packet? Good question, * the deal with this packet? Good question,
* let's dump it out. * let's dump it out.
*/ */
err(__FUNCTION__ err("%s: desc not first and last!\n", __FUNCTION__);
": desc not first and last!\n");
dump_rx_desc(0, dev, nextOut); dump_rx_desc(0, dev, nextOut);
} }
cmdstat |= (u32)rxOwn; cmdstat |= (u32)rxOwn;
...@@ -1294,8 +1290,7 @@ gt96100_rx(struct net_device *dev, u32 status) ...@@ -1294,8 +1290,7 @@ gt96100_rx(struct net_device *dev, u32 status)
/* Create new skb. */ /* Create new skb. */
skb = dev_alloc_skb(pkt_len+2); skb = dev_alloc_skb(pkt_len+2);
if (skb == NULL) { if (skb == NULL) {
err(__FUNCTION__ err("%s: Memory squeeze, dropping packet.\n", __FUNCTION__);
": Memory squeeze, dropping packet.\n");
gp->stats.rx_dropped++; gp->stats.rx_dropped++;
cmdstat |= (u32)rxOwn; cmdstat |= (u32)rxOwn;
rd->cmdstat = cpu_to_dma32(cmdstat); rd->cmdstat = cpu_to_dma32(cmdstat);
...@@ -1317,7 +1312,7 @@ gt96100_rx(struct net_device *dev, u32 status) ...@@ -1317,7 +1312,7 @@ gt96100_rx(struct net_device *dev, u32 status)
} }
if (nextOut == gp->rx_next_out) if (nextOut == gp->rx_next_out)
dbg(3, __FUNCTION__ ": RxCDP did not increment?\n"); dbg(3, "%s: RxCDP did not increment?\n", __FUNCTION__);
gp->rx_next_out = nextOut; gp->rx_next_out = nextOut;
return 0; return 0;
...@@ -1345,7 +1340,7 @@ gt96100_tx_complete(struct net_device *dev, u32 status) ...@@ -1345,7 +1340,7 @@ gt96100_tx_complete(struct net_device *dev, u32 status)
td = &gp->tx_ring[nextOut]; td = &gp->tx_ring[nextOut];
cmdstat = dma32_to_cpu(td->cmdstat); cmdstat = dma32_to_cpu(td->cmdstat);
dbg(3, __FUNCTION__ ": Tx desc cmdstat=%x, nextOut=%d\n", dbg(3, "%s: Tx desc cmdstat=%x, nextOut=%d\n", __FUNCTION__,
cmdstat, nextOut); cmdstat, nextOut);
if (cmdstat & (u32)txOwn) { if (cmdstat & (u32)txOwn) {
...@@ -1358,7 +1353,7 @@ gt96100_tx_complete(struct net_device *dev, u32 status) ...@@ -1358,7 +1353,7 @@ gt96100_tx_complete(struct net_device *dev, u32 status)
// increment Tx error stats // increment Tx error stats
if (cmdstat & (u32)txErrorSummary) { if (cmdstat & (u32)txErrorSummary) {
dbg(2, __FUNCTION__ ": Tx error, cmdstat = %x\n", dbg(2, "%s: Tx error, cmdstat = %x\n", __FUNCTION__,
cmdstat); cmdstat);
gp->stats.tx_errors++; gp->stats.tx_errors++;
if (cmdstat & (u32)txReTxLimit) if (cmdstat & (u32)txReTxLimit)
...@@ -1379,8 +1374,7 @@ gt96100_tx_complete(struct net_device *dev, u32 status) ...@@ -1379,8 +1374,7 @@ gt96100_tx_complete(struct net_device *dev, u32 status)
gp->tx_full = 0; gp->tx_full = 0;
if (gp->last_psr & psrLink) { if (gp->last_psr & psrLink) {
netif_wake_queue(dev); netif_wake_queue(dev);
dbg(2, __FUNCTION__ dbg(2, "%s: Tx Ring was full, queue waked\n", __FUNCTION_);
": Tx Ring was full, queue waked\n");
} }
} }
...@@ -1389,24 +1383,24 @@ gt96100_tx_complete(struct net_device *dev, u32 status) ...@@ -1389,24 +1383,24 @@ gt96100_tx_complete(struct net_device *dev, u32 status)
// free the skb // free the skb
if (gp->tx_skbuff[nextOut]) { if (gp->tx_skbuff[nextOut]) {
dbg(3, __FUNCTION__ ": good Tx, skb=%p\n", dbg(3, "%s: good Tx, skb=%p\n", __FUNCTION__,
gp->tx_skbuff[nextOut]); gp->tx_skbuff[nextOut]);
dev_kfree_skb_irq(gp->tx_skbuff[nextOut]); dev_kfree_skb_irq(gp->tx_skbuff[nextOut]);
gp->tx_skbuff[nextOut] = NULL; gp->tx_skbuff[nextOut] = NULL;
} else { } else {
err(__FUNCTION__ ": no skb!\n"); err("%s: no skb!\n", __FUNCTION__);
} }
} }
gp->tx_next_out = nextOut; gp->tx_next_out = nextOut;
if (gt96100_check_tx_consistent(gp)) { if (gt96100_check_tx_consistent(gp)) {
err(__FUNCTION__ ": Tx queue inconsistent!\n"); err("%s: Tx queue inconsistent!\n", __FUNCTION__);
} }
if ((status & icrTxEndLow) && gp->tx_count != 0) { if ((status & icrTxEndLow) && gp->tx_count != 0) {
// we must restart the DMA // we must restart the DMA
dbg(3, __FUNCTION__ ": Restarting Tx DMA\n"); dbg(3, "%s: Restarting Tx DMA\n", __FUNCTION__);
GT96100ETH_WRITE(gp, GT96100_ETH_SDMA_COMM, GT96100ETH_WRITE(gp, GT96100_ETH_SDMA_COMM,
sdcmrERD | sdcmrTXDL); sdcmrERD | sdcmrTXDL);
} }
...@@ -1421,11 +1415,11 @@ gt96100_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -1421,11 +1415,11 @@ gt96100_interrupt(int irq, void *dev_id, struct pt_regs *regs)
u32 status; u32 status;
if (dev == NULL) { if (dev == NULL) {
err(__FUNCTION__ ": null dev ptr\n"); err("%s: null dev ptr\n", __FUNCTION__);
return; return;
} }
dbg(3, __FUNCTION__ ": entry, icr=%x\n", dbg(3, "%s: entry, icr=%x\n", __FUNCTION__,
GT96100ETH_READ(gp, GT96100_ETH_INT_CAUSE)); GT96100ETH_READ(gp, GT96100_ETH_INT_CAUSE));
spin_lock(&gp->lock); spin_lock(&gp->lock);
...@@ -1460,13 +1454,13 @@ gt96100_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -1460,13 +1454,13 @@ gt96100_interrupt(int irq, void *dev_id, struct pt_regs *regs)
if ((psr & psrLink) && !gp->tx_full && if ((psr & psrLink) && !gp->tx_full &&
netif_queue_stopped(dev)) { netif_queue_stopped(dev)) {
dbg(0, __FUNCTION__ dbg(0, ": Link up, waking queue.\n",
": Link up, waking queue.\n"); __FUNCTION_);
netif_wake_queue(dev); netif_wake_queue(dev);
} else if (!(psr & psrLink) && } else if (!(psr & psrLink) &&
!netif_queue_stopped(dev)) { !netif_queue_stopped(dev)) {
dbg(0, __FUNCTION__ dbg(0, "Link down, stopping queue.\n",
"Link down, stopping queue.\n"); __FUNCTION__);
netif_stop_queue(dev); netif_stop_queue(dev);
} }
...@@ -1486,13 +1480,13 @@ gt96100_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -1486,13 +1480,13 @@ gt96100_interrupt(int irq, void *dev_id, struct pt_regs *regs)
// Now check TX errors (RX errors were handled in gt96100_rx) // Now check TX errors (RX errors were handled in gt96100_rx)
if (status & icrTxErrorLow) { if (status & icrTxErrorLow) {
err(__FUNCTION__ ": Tx resource error\n"); err("%s: Tx resource error\n", __FUNCTION__);
if (--gp->intr_work_done == 0) if (--gp->intr_work_done == 0)
break; break;
} }
if (status & icrTxUdr) { if (status & icrTxUdr) {
err(__FUNCTION__ ": Tx underrun error\n"); err("%s: Tx underrun error\n", __FUNCTION__);
if (--gp->intr_work_done == 0) if (--gp->intr_work_done == 0)
break; break;
} }
...@@ -1501,10 +1495,10 @@ gt96100_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -1501,10 +1495,10 @@ gt96100_interrupt(int irq, void *dev_id, struct pt_regs *regs)
if (gp->intr_work_done == 0) { if (gp->intr_work_done == 0) {
// ACK any remaining pending interrupts // ACK any remaining pending interrupts
GT96100ETH_WRITE(gp, GT96100_ETH_INT_CAUSE, 0); GT96100ETH_WRITE(gp, GT96100_ETH_INT_CAUSE, 0);
dbg(3, __FUNCTION__ ": hit max work\n"); dbg(3, "%s: hit max work\n", __FUNCTION__);
} }
dbg(3, __FUNCTION__ ": exit, icr=%x\n", dbg(3, "%s: exit, icr=%x\n", __FUNCTION__,
GT96100ETH_READ(gp, GT96100_ETH_INT_CAUSE)); GT96100ETH_READ(gp, GT96100_ETH_INT_CAUSE));
spin_unlock(&gp->lock); spin_unlock(&gp->lock);
...@@ -1543,7 +1537,7 @@ gt96100_set_rx_mode(struct net_device *dev) ...@@ -1543,7 +1537,7 @@ gt96100_set_rx_mode(struct net_device *dev)
unsigned long flags; unsigned long flags;
//struct dev_mc_list *mcptr; //struct dev_mc_list *mcptr;
dbg(3, __FUNCTION__ ": dev=%p, flags=%x\n", dev, dev->flags); dbg(3, "%s: dev=%p, flags=%x\n", __FUNCTION__, dev, dev->flags);
// stop the Receiver DMA // stop the Receiver DMA
abort(dev, sdcmrAR); abort(dev, sdcmrAR);
...@@ -1586,7 +1580,7 @@ gt96100_get_stats(struct net_device *dev) ...@@ -1586,7 +1580,7 @@ gt96100_get_stats(struct net_device *dev)
struct gt96100_private *gp = (struct gt96100_private *)dev->priv; struct gt96100_private *gp = (struct gt96100_private *)dev->priv;
unsigned long flags; unsigned long flags;
dbg(3, __FUNCTION__ ": dev=%p\n", dev); dbg(3, "%s: dev=%p\n", __FUNCTION__, dev);
if (netif_device_present(dev)) { if (netif_device_present(dev)) {
spin_lock_irqsave (&gp->lock, flags); spin_lock_irqsave (&gp->lock, flags);
......
drivers/net/wan/cycx_drv.c
View file @ 4a9bdcd1
...@@ -423,9 +423,9 @@ static int load_cyc2x(cycxhw_t *hw, cfm_t *cfm, u32 len) ...@@ -423,9 +423,9 @@ static int load_cyc2x(cycxhw_t *hw, cfm_t *cfm, u32 len)
/* Verify firmware module format version */ /* Verify firmware module format version */
if (cfm->version != CFM_VERSION) { if (cfm->version != CFM_VERSION) {
printk(KERN_ERR "%s:" __FUNCTION__ ": firmware format %u rejected! " printk(KERN_ERR "%s:%s: firmware format %u rejected! "
"Expecting %u.\n", "Expecting %u.\n",
modname, cfm->version, CFM_VERSION); modname, __FUNCTION__, cfm->version, CFM_VERSION);
return -EINVAL; return -EINVAL;
} }
...@@ -437,8 +437,8 @@ static int load_cyc2x(cycxhw_t *hw, cfm_t *cfm, u32 len) ...@@ -437,8 +437,8 @@ static int load_cyc2x(cycxhw_t *hw, cfm_t *cfm, u32 len)
if (((len - sizeof(cfm_t) - 1) != cfm->info.codesize) || if (((len - sizeof(cfm_t) - 1) != cfm->info.codesize) ||
*/ */
if (cksum != cfm->checksum) { if (cksum != cfm->checksum) {
printk(KERN_ERR "%s:" __FUNCTION__ ": firmware corrupted!\n", printk(KERN_ERR "%s:%s: firmware corrupted!\n",
modname); modname, __FUNCTION__);
printk(KERN_ERR " cdsize = 0x%x (expected 0x%lx)\n", printk(KERN_ERR " cdsize = 0x%x (expected 0x%lx)\n",
len - sizeof(cfm_t) - 1, cfm->info.codesize); len - sizeof(cfm_t) - 1, cfm->info.codesize);
printk(KERN_ERR " chksum = 0x%x (expected 0x%x)\n", printk(KERN_ERR " chksum = 0x%x (expected 0x%x)\n",
...@@ -450,7 +450,7 @@ static int load_cyc2x(cycxhw_t *hw, cfm_t *cfm, u32 len) ...@@ -450,7 +450,7 @@ static int load_cyc2x(cycxhw_t *hw, cfm_t *cfm, u32 len)
img_hdr = (cycx_header_t*)(((u8*)cfm) + sizeof(cfm_t) - 1); img_hdr = (cycx_header_t*)(((u8*)cfm) + sizeof(cfm_t) - 1);
#ifdef FIRMWARE_DEBUG #ifdef FIRMWARE_DEBUG
printk(KERN_INFO "%s:" __FUNCTION__ ": image sizes\n", modname); printk(KERN_INFO "%s:%s: image sizes\n", __FUNCTION__, modname);
printk(KERN_INFO " reset=%lu\n", img_hdr->reset_size); printk(KERN_INFO " reset=%lu\n", img_hdr->reset_size);
printk(KERN_INFO " data=%lu\n", img_hdr->data_size); printk(KERN_INFO " data=%lu\n", img_hdr->data_size);
printk(KERN_INFO " code=%lu\n", img_hdr->code_size); printk(KERN_INFO " code=%lu\n", img_hdr->code_size);
......
drivers/net/wan/cycx_x25.c
View file @ 4a9bdcd1
...@@ -1446,7 +1446,7 @@ static void chan_x25_send_event(struct net_device *dev, u8 event) ...@@ -1446,7 +1446,7 @@ static void chan_x25_send_event(struct net_device *dev, u8 event)
unsigned char *ptr; unsigned char *ptr;
if ((skb = dev_alloc_skb(1)) == NULL) { if ((skb = dev_alloc_skb(1)) == NULL) {
printk(KERN_ERR __FUNCTION__ ": out of memory\n"); printk(KERN_ERR "%s: out of memory\n", __FUNCTION__);
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7