From patchwork Thu Apr 18 16:58:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 18053 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1USsDW-0003Ha-2v; Thu, 18 Apr 2013 19:01:50 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp id 1USsDV-0003pZ-HV; Thu, 18 Apr 2013 19:01:49 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967758Ab3DRRBO (ORCPT + 1 other); Thu, 18 Apr 2013 13:01:14 -0400 Received: from mail-da0-f54.google.com ([209.85.210.54]:63743 "EHLO mail-da0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967752Ab3DRQ7X (ORCPT ); Thu, 18 Apr 2013 12:59:23 -0400 Received: by mail-da0-f54.google.com with SMTP id p1so1477098dad.41 for ; Thu, 18 Apr 2013 09:59:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=GSm+x9paCcwSnbPSLPiUXWQw8CgUkScVKWCHOdZGTgQ=; b=vb1aSmr4aPqTwve1EESiKuOSCvEH/53t+6zCSxJkR73rTPgWcDOjzaHVe6nBk9f4w6 qglaePvg+Nwox6O1ZAnZ7s2ZCWB4XTzdwkuKZZVQ2kdTHL3qWF5PuF9PfMQP4oDyc5fT HuowiX/VTQIXs+rkj4lASNUQ9XXQeck/OYhCt5g9nk0P90f9mTn6F7TMpXcmpRc3YZ6r PPRGbJ95iJ/lpJhbew4Rw32QIASgae40I2A6mT82WEDDx9pUN8OmNZbZl8lTlUC1DSvp +5as4Viss8aNtTOqt+13Y8hOoW+KFUBGnPgOy4RHg2r/KhHDKQoyAS8hbNtj3TwefwhZ rNBw== X-Received: by 10.66.226.171 with SMTP id rt11mr13917418pac.131.1366304362701; Thu, 18 Apr 2013 09:59:22 -0700 (PDT) Received: from charmander.workstations.synapsedev.com ([65.89.160.20]) by mx.google.com with ESMTPS id do4sm10491136pbc.8.2013.04.18.09.59.20 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 09:59:21 -0700 (PDT) From: Andrey Smirnov To: sameo@linux.intel.com Cc: mchehab@redhat.com, andrew.smirnov@gmail.com, hverkuil@xs4all.nl, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Verkuil Subject: [PATCH 11/12] si476x: Fix some config dependencies and a compile warnings Date: Thu, 18 Apr 2013 09:58:37 -0700 Message-Id: <1366304318-29620-12-git-send-email-andrew.smirnov@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366304318-29620-1-git-send-email-andrew.smirnov@gmail.com> References: <1366304318-29620-1-git-send-email-andrew.smirnov@gmail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.4.18.165422 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, CT_TEXT_PLAIN_UTF8_CAPS 0, DATE_TZ_NA 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __HIGHBITS 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __SUBJ_ALPHA_NEGATE 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Hans Verkuil 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 Signed-off-by: Hans Verkuil --- drivers/media/radio/Kconfig | 2 +- drivers/mfd/Kconfig | 1 + drivers/mfd/si476x-i2c.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) 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);