| Message ID | 20090921182345.GA25100@elte.hu (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Em Mon, 21 Sep 2009 20:23:45 +0200 Ingo Molnar <mingo@elte.hu> escreveu: > > * Mauro Carvalho Chehab <mchehab@redhat.com> wrote: > > > This series also contains several new drivers: > > > > - new driver for NXP saa7164; > > -tip testing found that an allyesconfig build buglet found its way into > this driver - find the fix below. > > diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c > index f0dbead..60f3214 100644 > --- a/drivers/media/video/saa7164/saa7164-core.c > +++ b/drivers/media/video/saa7164/saa7164-core.c > @@ -45,8 +45,8 @@ MODULE_LICENSE("GPL"); > 32 bus > */ > > -unsigned int debug; > -module_param(debug, int, 0644); > +unsigned int saa_debug; > +module_param(saa_debug, int, 0644); Hmm... it is better to use module_param_named(debug, saa_debug, int, 0644), to keep presenting the parameter as just "debug" to userspace. > This is because recent saa7164 changes introduced a global symbol > named 'debug'. The x86 platform code already defines a 'debug' > symbol. (which is named in a too generic way as well - but it > can be used nicely to weed out too generic symbols in drivers ;- Agreed. Btw, I suggest to do a similar patch also for x86, to avoid such future conflicts.
* Mauro Carvalho Chehab <mchehab@redhat.com> wrote: > Em Mon, 21 Sep 2009 20:23:45 +0200 > Ingo Molnar <mingo@elte.hu> escreveu: > > > > > * Mauro Carvalho Chehab <mchehab@redhat.com> wrote: > > > > > This series also contains several new drivers: > > > > > > - new driver for NXP saa7164; > > > > -tip testing found that an allyesconfig build buglet found its way into > > this driver - find the fix below. > > > > > diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c > > index f0dbead..60f3214 100644 > > --- a/drivers/media/video/saa7164/saa7164-core.c > > +++ b/drivers/media/video/saa7164/saa7164-core.c > > @@ -45,8 +45,8 @@ MODULE_LICENSE("GPL"); > > 32 bus > > */ > > > > -unsigned int debug; > > -module_param(debug, int, 0644); > > +unsigned int saa_debug; > > +module_param(saa_debug, int, 0644); > > Hmm... it is better to use module_param_named(debug, saa_debug, int, 0644), to > keep presenting the parameter as just "debug" to userspace. ah, yes, fully agreed - i thought i did that but apparently modified it in this instance. > > This is because recent saa7164 changes introduced a global symbol > > named 'debug'. The x86 platform code already defines a 'debug' > > symbol. (which is named in a too generic way as well - but it can be > > used nicely to weed out too generic symbols in drivers ;- > > Agreed. > > Btw, I suggest to do a similar patch also for x86, to avoid such > future conflicts. Actually, Andrew considers it a feature that allows us to filter out too generic names early on :-) Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/video/saa7164/saa7164-api.c b/drivers/media/video/saa7164/saa7164-api.c index bb6df1b..6f094a9 100644 --- a/drivers/media/video/saa7164/saa7164-api.c +++ b/drivers/media/video/saa7164/saa7164-api.c @@ -415,7 +415,7 @@ int saa7164_api_enum_subdevs(struct saa7164_dev *dev) goto out; } - if (debug & DBGLVL_API) + if (saa_debug & DBGLVL_API) saa7164_dumphex16(dev, buf, (buflen/16)*16); saa7164_api_dump_subdevs(dev, buf, buflen); @@ -480,7 +480,7 @@ int saa7164_api_i2c_read(struct saa7164_i2c *bus, u8 addr, u32 reglen, u8 *reg, dprintk(DBGLVL_API, "%s() len = %d bytes\n", __func__, len); - if (debug & DBGLVL_I2C) + if (saa_debug & DBGLVL_I2C) saa7164_dumphex16(dev, buf, 2 * 16); ret = saa7164_cmd_send(bus->dev, unitid, GET_CUR, @@ -488,7 +488,7 @@ int saa7164_api_i2c_read(struct saa7164_i2c *bus, u8 addr, u32 reglen, u8 *reg, if (ret != SAA_OK) printk(KERN_ERR "%s() error, ret(2) = 0x%x\n", __func__, ret); else { - if (debug & DBGLVL_I2C) + if (saa_debug & DBGLVL_I2C) saa7164_dumphex16(dev, buf, sizeof(buf)); memcpy(data, (buf + 2 * sizeof(u32) + reglen), datalen); } @@ -548,7 +548,7 @@ int saa7164_api_i2c_write(struct saa7164_i2c *bus, u8 addr, u32 datalen, *((u32 *)(buf + 1 * sizeof(u32))) = datalen - reglen; memcpy((buf + 2 * sizeof(u32)), data, datalen); - if (debug & DBGLVL_I2C) + if (saa_debug & DBGLVL_I2C) saa7164_dumphex16(dev, buf, sizeof(buf)); ret = saa7164_cmd_send(bus->dev, unitid, SET_CUR, diff --git a/drivers/media/video/saa7164/saa7164-cmd.c b/drivers/media/video/saa7164/saa7164-cmd.c index e097f1a..c45966e 100644 --- a/drivers/media/video/saa7164/saa7164-cmd.c +++ b/drivers/media/video/saa7164/saa7164-cmd.c @@ -250,7 +250,7 @@ int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno) unsigned long stamp; int r; - if (debug >= 4) + if (saa_debug >= 4) saa7164_bus_dump(dev); dprintk(DBGLVL_CMD, "%s(seqno=%d)\n", __func__, seqno); diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c index f0dbead..60f3214 100644 --- a/drivers/media/video/saa7164/saa7164-core.c +++ b/drivers/media/video/saa7164/saa7164-core.c @@ -45,8 +45,8 @@ MODULE_LICENSE("GPL"); 32 bus */ -unsigned int debug; -module_param(debug, int, 0644); +unsigned int saa_debug; +module_param(saa_debug, int, 0644); MODULE_PARM_DESC(debug, "enable debug messages"); unsigned int waitsecs = 10; @@ -653,7 +653,7 @@ static int __devinit saa7164_initdev(struct pci_dev *pci_dev, printk(KERN_ERR "%s() Unsupported board detected, " "registering without firmware\n", __func__); - dprintk(1, "%s() parameter debug = %d\n", __func__, debug); + dprintk(1, "%s() parameter debug = %d\n", __func__, saa_debug); dprintk(1, "%s() parameter waitsecs = %d\n", __func__, waitsecs); fail_fw: diff --git a/drivers/media/video/saa7164/saa7164.h b/drivers/media/video/saa7164/saa7164.h index 6753008..42660b5 100644 --- a/drivers/media/video/saa7164/saa7164.h +++ b/drivers/media/video/saa7164/saa7164.h @@ -375,9 +375,9 @@ extern int saa7164_buffer_dealloc(struct saa7164_tsport *port, /* ----------------------------------------------------------- */ -extern unsigned int debug; +extern unsigned int saa_debug; #define dprintk(level, fmt, arg...)\ - do { if (debug & level)\ + do { if (saa_debug & level)\ printk(KERN_DEBUG "%s: " fmt, dev->name, ## arg);\ } while (0)