From: domen@coderock.org
To: ralf@linux-mips.org
Cc: linux-mips@linux-mips.org, Clemens Buchacher <drizzd@aon.at>,
Maximilian Attems <janitor@sternwelten.at>,
domen@coderock.org
Subject: [patch 8/8] __FUNCTION__ string concatenation deprecated
Date: Mon, 20 Jun 2005 23:49:59 +0200 [thread overview]
Message-ID: <20050620214959.594768000@nd47.coderock.org> (raw)
[-- Attachment #1: function-string-arch-mips.patch --]
[-- Type: text/plain, Size: 3887 bytes --]
From: Clemens Buchacher <drizzd@aon.at>
__FUNCTION__ string concatenation is deprecated
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Domen Puncer <domen@coderock.org>
---
arch/mips/au1000/common/usbdev.c | 4 ++--
drivers/net/gt96100eth.c | 10 +++++-----
sound/oss/au1000.c | 2 +-
sound/oss/ite8172.c | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
Index: quilt/arch/mips/au1000/common/usbdev.c
===================================================================
--- quilt.orig/arch/mips/au1000/common/usbdev.c
+++ quilt/arch/mips/au1000/common/usbdev.c
@@ -348,7 +348,7 @@ endpoint_stall(endpoint_t * ep)
{
u32 cs;
- warn(__FUNCTION__);
+ warn("%s", __FUNCTION__);
cs = au_readl(ep->reg->ctrl_stat) | USBDEV_CS_STALL;
au_writel(cs, ep->reg->ctrl_stat);
@@ -360,7 +360,7 @@ endpoint_unstall(endpoint_t * ep)
{
u32 cs;
- warn(__FUNCTION__);
+ warn("%s", __FUNCTION__);
cs = au_readl(ep->reg->ctrl_stat) & ~USBDEV_CS_STALL;
au_writel(cs, ep->reg->ctrl_stat);
Index: quilt/drivers/net/gt96100eth.c
===================================================================
--- quilt.orig/drivers/net/gt96100eth.c
+++ quilt/drivers/net/gt96100eth.c
@@ -73,7 +73,7 @@ static void dump_rx_desc(int dbg_lvl, st
static void dump_skb(int dbg_lvl, struct net_device *dev,
struct sk_buff *skb);
static void dump_hw_addr(int dbg_lvl, struct net_device *dev,
- const char* pfx, unsigned char* addr_str);
+ const char* pfx, const char* func, unsigned char* addr_str);
static void update_stats(struct gt96100_private *gp);
static void abort(struct net_device *dev, u32 abort_bits);
static void hard_stop(struct net_device *dev);
@@ -334,13 +334,13 @@ dump_MII(int dbg_lvl, struct net_device
static void
dump_hw_addr(int dbg_lvl, struct net_device *dev, const char* pfx,
- unsigned char* addr_str)
+ const char* func, unsigned char* addr_str)
{
int i;
char buf[100], octet[5];
if (dbg_lvl <= GT96100_DEBUG) {
- strcpy(buf, pfx);
+ sprintf(buf, pfx, func);
for (i = 0; i < 6; i++) {
sprintf(octet, "%2.2x%s",
addr_str[i], i<5 ? ":" : "\n");
@@ -708,7 +708,7 @@ static int __init gt96100_probe1(struct
info("%s found at 0x%x, irq %d\n",
chip_name(gp->chip_rev), gtif->iobase, gtif->irq);
- dump_hw_addr(0, dev, "HW Address ", dev->dev_addr);
+ dump_hw_addr(0, dev, "%s: HW Address ", __FUNCTION__, dev->dev_addr);
info("%s chip revision=%d\n", chip_name(gp->chip_rev), gp->chip_rev);
info("%s ethernet port %d\n", chip_name(gp->chip_rev), gp->port_num);
info("external PHY ID1=0x%04x, ID2=0x%04x\n", phy_id1, phy_id2);
@@ -1488,7 +1488,7 @@ gt96100_set_rx_mode(struct net_device *d
gt96100_add_hash_entry(dev, dev->dev_addr);
for (mcptr = dev->mc_list; mcptr; mcptr = mcptr->next) {
- dump_hw_addr(2, dev, __FUNCTION__ ": addr=",
+ dump_hw_addr(2, dev, "%s: addr=", __FUNCTION__,
mcptr->dmi_addr);
gt96100_add_hash_entry(dev, mcptr->dmi_addr);
}
Index: quilt/sound/oss/au1000.c
===================================================================
--- quilt.orig/sound/oss/au1000.c
+++ quilt/sound/oss/au1000.c
@@ -1295,7 +1295,7 @@ static int au1000_mmap(struct file *file
unsigned long size;
int ret = 0;
- dbg(__FUNCTION__);
+ dbg("%s", __FUNCTION__);
lock_kernel();
down(&s->sem);
Index: quilt/sound/oss/ite8172.c
===================================================================
--- quilt.orig/sound/oss/ite8172.c
+++ quilt/sound/oss/ite8172.c
@@ -1859,7 +1859,7 @@ static int it8172_release(struct inode *
struct it8172_state *s = (struct it8172_state *)file->private_data;
#ifdef IT8172_VERBOSE_DEBUG
- dbg(__FUNCTION__);
+ dbg("%s", __FUNCTION__);
#endif
lock_kernel();
if (file->f_mode & FMODE_WRITE)
--
next reply other threads:[~2005-06-20 21:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-20 21:49 domen [this message]
-- strict thread matches above, loose matches on Subject: below --
2005-03-06 10:46 [patch 8/8] __FUNCTION__ string concatenation deprecated domen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050620214959.594768000@nd47.coderock.org \
--to=domen@coderock.org \
--cc=drizzd@aon.at \
--cc=janitor@sternwelten.at \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.