From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751893Ab2BVNZI (ORCPT ); Wed, 22 Feb 2012 08:25:08 -0500 Received: from wp188.webpack.hosteurope.de ([80.237.132.195]:38718 "EHLO wp188.webpack.hosteurope.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751186Ab2BVNZE (ORCPT ); Wed, 22 Feb 2012 08:25:04 -0500 From: Danny Kukawka To: Andy Walls Cc: Danny Kukawka , Mauro Carvalho Chehab , ivtv-devel@ivtvdriver.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Rusty Russell , mchehab@redhat.com Subject: [RESEND][PATCH v2 2/2] ivtv-driver: fix handling of 'radio' module parameter Date: Wed, 22 Feb 2012 14:24:56 +0100 Message-Id: <1329917096-19438-3-git-send-email-danny.kukawka@bisect.de> X-Mailer: git-send-email 1.7.8.3 In-Reply-To: <1329917096-19438-1-git-send-email-danny.kukawka@bisect.de> References: <1329917096-19438-1-git-send-email-danny.kukawka@bisect.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-bounce-key: webpack.hosteurope.de;danny.kukawka@bisect.de;1329917104;f2c6146e; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Reverse ivtv-driver part of commit 90ab5ee94171b3e28de6bb42ee30b527014e0be7 and change module_param_array() type from bool to int to fix compiler warning: In function ‘__check_radio’: 113:1: warning: return from incompatible pointer type [enabled by default] At top level: 113:1: warning: initialization from incompatible pointer type [enabled by default] 113:1: warning: (near initialization for ‘__param_arr_radio.num’) [enabled by default] v2: set radio_c to true instead of 1 since it's bool v3: corrected version, don't change to module_param_named(), change all to int/uint Signed-off-by: Danny Kukawka --- drivers/media/video/ivtv/ivtv-driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c index 107e9e6..ab6ed116 100644 --- a/drivers/media/video/ivtv/ivtv-driver.c +++ b/drivers/media/video/ivtv/ivtv-driver.c @@ -99,7 +99,7 @@ static int i2c_clock_period[IVTV_MAX_CARDS] = { -1, -1, -1, -1, -1, -1, -1, -1, static unsigned int cardtype_c = 1; static unsigned int tuner_c = 1; -static bool radio_c = 1; +static unsigned int radio_c = 1; static unsigned int i2c_clock_period_c = 1; static char pal[] = "---"; static char secam[] = "--"; @@ -139,7 +139,7 @@ static int tunertype = -1; static int newi2c = -1; module_param_array(tuner, int, &tuner_c, 0644); -module_param_array(radio, bool, &radio_c, 0644); +module_param_array(radio, int, &radio_c, 0644); module_param_array(cardtype, int, &cardtype_c, 0644); module_param_string(pal, pal, sizeof(pal), 0644); module_param_string(secam, secam, sizeof(secam), 0644); -- 1.7.8.3