From: Danny Kukawka <danny.kukawka@bisect.de>
To: Andy Walls <awalls@md.metrocast.net>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>,
ivtv-devel@ivtvdriver.org, linux-media@vger.kernel.org,
linux-kernel@vger.kernel.org,
Rusty Russell <rusty@rustcorp.com.au>,
mchehab@redhat.com
Subject: [PATCH v3 2/2] ivtv-driver: fix handling of 'radio' module parameter
Date: Tue, 31 Jan 2012 16:27:08 +0100 [thread overview]
Message-ID: <1328023628-15097-3-git-send-email-danny.kukawka@bisect.de> (raw)
In-Reply-To: <1328023628-15097-1-git-send-email-danny.kukawka@bisect.de>
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 <danny.kukawka@bisect.de>
---
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 3949b7d..06192ae 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.7.3
prev parent reply other threads:[~2012-01-31 15:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-31 15:27 [PATCH v2 0/2] fix cx18-/ivtv-driver 'radio' module parameter Danny Kukawka
2012-01-31 15:27 ` [PATCH v2 1/2] cx18-driver: fix handling of " Danny Kukawka
2012-01-31 15:27 ` Danny Kukawka [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1328023628-15097-3-git-send-email-danny.kukawka@bisect.de \
--to=danny.kukawka@bisect.de \
--cc=awalls@md.metrocast.net \
--cc=ivtv-devel@ivtvdriver.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=mchehab@redhat.com \
--cc=rusty@rustcorp.com.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).