Commit 6bf7861f authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] si476x: Fix some config dependencies and a compile warnings

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]
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b0efc3ed
...@@ -20,7 +20,7 @@ source "drivers/media/radio/si470x/Kconfig" ...@@ -20,7 +20,7 @@ source "drivers/media/radio/si470x/Kconfig"
config RADIO_SI476X config RADIO_SI476X
tristate "Silicon Laboratories Si476x I2C FM Radio" 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_CORE
select MFD_SI476X_CORE select MFD_SI476X_CORE
select SND_SOC_SI476X select SND_SOC_SI476X
......
...@@ -980,6 +980,7 @@ config MFD_SI476X_CORE ...@@ -980,6 +980,7 @@ config MFD_SI476X_CORE
tristate "Support for Silicon Laboratories 4761/64/68 AM/FM radio." tristate "Support for Silicon Laboratories 4761/64/68 AM/FM radio."
depends on I2C depends on I2C
select MFD_CORE select MFD_CORE
select REGMAP_I2C
help help
This is the core driver for the SI476x series of AM/FM This is the core driver for the SI476x series of AM/FM
radio. This MFD driver connects the radio-si476x V4L2 module radio. This MFD driver connects the radio-si476x V4L2 module
......
...@@ -389,7 +389,7 @@ static void si476x_core_drain_rds_fifo(struct work_struct *work) ...@@ -389,7 +389,7 @@ static void si476x_core_drain_rds_fifo(struct work_struct *work)
kfifo_in(&core->rds_fifo, report.rds, kfifo_in(&core->rds_fifo, report.rds,
sizeof(report.rds)); sizeof(report.rds));
dev_dbg(&core->client->dev, "RDS data:\n %*ph\n", 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"); dev_dbg(&core->client->dev, "Drrrrained!\n");
wake_up_interruptible(&core->rds_read_queue); wake_up_interruptible(&core->rds_read_queue);
......
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