| Message ID | 1366304318-29620-12-git-send-email-andrew.smirnov@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Apr 18, 2013 at 09:58:37AM -0700, Andrey Smirnov wrote: > From: Hans Verkuil <hverkuil@xs4all.nl> > > radio-si476x depends on SND and SND_SOC, the mfd driver should select > REGMAP_I2C. > > Also fix a small compile warning in a debug message: > > drivers/mfd/si476x-i2c.c: In function ‘si476x_core_drain_rds_fifo’: > drivers/mfd/si476x-i2c.c:391:4: warning: field width specifier ‘*’ expects argument of type ‘int’, but argument 4 has type ‘long unsigned int’ [-Wformat] > > Acked-by: Andrey Smirnov <andrew.smirnov@gmail.com> > Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> > --- > drivers/media/radio/Kconfig | 2 +- > drivers/mfd/Kconfig | 1 + > drivers/mfd/si476x-i2c.c | 2 +- You should have merged the MFD bits from this patch into one of the first 4 patches, that are MFD related. Or at least separated those 2 changes into 2 patches... Cheers, Samuel.
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig index 170460d..181a25f 100644 --- a/drivers/media/radio/Kconfig +++ b/drivers/media/radio/Kconfig @@ -20,7 +20,7 @@ source "drivers/media/radio/si470x/Kconfig" config RADIO_SI476X tristate "Silicon Laboratories Si476x I2C FM Radio" - depends on I2C && VIDEO_V4L2 + depends on I2C && VIDEO_V4L2 && SND && SND_SOC select MFD_CORE select MFD_SI476X_CORE select SND_SOC_SI476X diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 3cd8f21..606e549 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -974,6 +974,7 @@ config MFD_SI476X_CORE tristate "Support for Silicon Laboratories 4761/64/68 AM/FM radio." depends on I2C select MFD_CORE + select REGMAP_I2C help This is the core driver for the SI476x series of AM/FM radio. This MFD driver connects the radio-si476x V4L2 module diff --git a/drivers/mfd/si476x-i2c.c b/drivers/mfd/si476x-i2c.c index 118c6b1..f5bc8e4 100644 --- a/drivers/mfd/si476x-i2c.c +++ b/drivers/mfd/si476x-i2c.c @@ -389,7 +389,7 @@ static void si476x_core_drain_rds_fifo(struct work_struct *work) kfifo_in(&core->rds_fifo, report.rds, sizeof(report.rds)); dev_dbg(&core->client->dev, "RDS data:\n %*ph\n", - sizeof(report.rds), report.rds); + (int)sizeof(report.rds), report.rds); } dev_dbg(&core->client->dev, "Drrrrained!\n"); wake_up_interruptible(&core->rds_read_queue);