[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: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 28ded247abc007ab129bd4cc18e95f3eec18a912..fef427e386c116cc92b83b3f55d815e5faaca242 100644 (file)
--- 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 9b80e1edeeb62e5bad39972f1325de6691bfa340..2f97ad188fc23b2d320d22244f15eaed0ecb2733 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -980,6 +980,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 118c6b13d8cb53e86340139dfe8e69c50e6ec6a5..f5bc8e4bd4bf631b3266091a3af6212be07138cf 100644 (file)
--- 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);