From patchwork Thu Apr 18 16:58:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 18051 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1USsC1-0003GN-47; Thu, 18 Apr 2013 19:00:17 +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-3) with esmtp id 1USsC0-00059k-Cx; Thu, 18 Apr 2013 19:00:16 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967746Ab3DRQ7v (ORCPT + 1 other); Thu, 18 Apr 2013 12:59:51 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:41421 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967753Ab3DRQ7Z (ORCPT ); Thu, 18 Apr 2013 12:59:25 -0400 Received: by mail-pa0-f44.google.com with SMTP id bi5so1724365pad.17 for ; Thu, 18 Apr 2013 09:59:24 -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; bh=+pRTNQ7xmO5u+FQT/k5gQk7YL+yE4PaZrwh7Bbg0qIY=; b=jUWfZ+RIIJFeuoccDWaqzd//H5ofHTmkJnTAYypZKOddC1Q6mb2BfledCRXKkJnhtf S6krgAy/OpOzSPzOyPMrsOK7l5J0i6NyOgmksUs0Y3HijujN7XyMuMdUb1SpH4pDHiDd tSSpXqj/ySLHY4NXqHa21A7XDMIvENWL5zQ80zcHimp23LLR5x/3f37F0340UZmcFAEq L88Y+td8mUZm2mmeJMxQSG1ufORpSWuEkdFv/2HdbfD8eOo6m+UwR+VVxPkGK3guvbrn w0dVlYlRXUNfYiWjz7olfBP1HBb+ZcDuepJvwkjNaxJa/ILAkQ3kEQroT8qR1heVOXhc KUMg== X-Received: by 10.68.160.226 with SMTP id xn2mr14379054pbb.174.1366304364543; Thu, 18 Apr 2013 09:59:24 -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.22 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Apr 2013 09:59:23 -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, Dan Carpenter Subject: [PATCH 12/12] radio-si476x: Fix incorrect pointer checking Date: Thu, 18 Apr 2013 09:58:38 -0700 Message-Id: <1366304318-29620-13-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> 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.165117 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, DATE_TZ_NA 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 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, __IN_REP_TO 0, __MIME_TEXT_ONLY 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' Fix incorrect pointer checking and make some minor code improvements: * Remove unnecessary elements from function pointer table(vtable), that includes all the elements that are FM-only, this allows for not checking of the fucntion pointer and calling of the function directly(THe check if the tuner is in FM mode has to be done anyway) * Fix incorrect function pointer checking where the code would check one pointer to be non-NULL, but would use other pointer, which would not be checked. * Remove code duplication in "si476x_radio_read_rsq_blob" and "si476x_radio_read_rsq_primary_blob". * Add some BUG_ON statements for function pointers that should never be NULL Signed-off-by: Andrey Smirnov Signed-off-by: Dan Carpenter --- drivers/media/radio/radio-si476x.c | 90 +++++++++++++----------------------- 1 file changed, 33 insertions(+), 57 deletions(-) diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c index 9430c6a..378c7f0 100644 --- a/drivers/media/radio/radio-si476x.c +++ b/drivers/media/radio/radio-si476x.c @@ -270,8 +270,6 @@ struct si476x_radio; * @seek_start: Star station seeking * @rsq_status: Get Recieved Signal Quality(RSQ) status * @rds_blckcnt: Get recived RDS blocks count - * @phase_diversity: Change phase diversity mode of the tuner - * @phase_div_status: Get phase diversity mode status * @acf_status: Get the status of Automatically Controlled * Features(ACF) * @agc_status: Get Automatic Gain Control(AGC) status @@ -281,16 +279,8 @@ struct si476x_radio_ops { int (*seek_start)(struct si476x_core *, bool, bool); int (*rsq_status)(struct si476x_core *, struct si476x_rsq_status_args *, struct si476x_rsq_status_report *); - int (*rds_blckcnt)(struct si476x_core *, bool, - struct si476x_rds_blockcount_report *); - - int (*phase_diversity)(struct si476x_core *, - enum si476x_phase_diversity_mode); - int (*phase_div_status)(struct si476x_core *); int (*acf_status)(struct si476x_core *, struct si476x_acf_status_report *); - int (*agc_status)(struct si476x_core *, - struct si476x_agc_status_report *); }; /** @@ -495,22 +485,14 @@ static int si476x_radio_init_vtable(struct si476x_radio *radio, .tune_freq = si476x_core_cmd_fm_tune_freq, .seek_start = si476x_core_cmd_fm_seek_start, .rsq_status = si476x_core_cmd_fm_rsq_status, - .rds_blckcnt = si476x_core_cmd_fm_rds_blockcount, - .phase_diversity = si476x_core_cmd_fm_phase_diversity, - .phase_div_status = si476x_core_cmd_fm_phase_div_status, .acf_status = si476x_core_cmd_fm_acf_status, - .agc_status = si476x_core_cmd_agc_status, }; static const struct si476x_radio_ops am_ops = { .tune_freq = si476x_core_cmd_am_tune_freq, .seek_start = si476x_core_cmd_am_seek_start, .rsq_status = si476x_core_cmd_am_rsq_status, - .rds_blckcnt = NULL, - .phase_diversity = NULL, - .phase_div_status = NULL, .acf_status = si476x_core_cmd_am_acf_status, - .agc_status = NULL, }; switch (func) { @@ -545,11 +527,15 @@ static int si476x_radio_pretune(struct si476x_radio *radio, case SI476X_FUNC_FM_RECEIVER: args.freq = v4l2_to_si476x(radio->core, 92 * FREQ_MUL); + + BUG_ON(!radio->ops->tune_freq); retval = radio->ops->tune_freq(radio->core, &args); break; case SI476X_FUNC_AM_RECEIVER: args.freq = v4l2_to_si476x(radio->core, 0.6 * FREQ_MUL); + + BUG_ON(!radio->ops->tune_freq); retval = radio->ops->tune_freq(radio->core, &args); break; default: @@ -599,7 +585,7 @@ static int si476x_radio_do_post_powerup_init(struct si476x_radio *radio, if (err < 0) return err; - if (func == SI476X_FUNC_FM_RECEIVER) { + if (!si476x_core_is_in_am_receiver_mode(radio->core)) { if (si476x_core_has_diversity(radio->core)) { err = si476x_core_cmd_fm_phase_diversity(radio->core, radio->core->diversity_mode); @@ -743,6 +729,7 @@ static int si476x_radio_s_frequency(struct file *file, void *priv, args.smoothmetrics = SI476X_SM_INITIALIZE_AUDIO; args.antcap = 0; + BUG_ON(!radio->ops->tune_freq); err = radio->ops->tune_freq(radio->core, &args); unlock: @@ -833,6 +820,7 @@ static int si476x_radio_s_hw_freq_seek(struct file *file, void *priv, goto unlock; } + BUG_ON(!radio->ops->seek_start); err = radio->ops->seek_start(radio->core, seek->seek_upward, seek->wrap_around); @@ -854,8 +842,8 @@ static int si476x_radio_g_volatile_ctrl(struct v4l2_ctrl *ctrl) switch (ctrl->id) { case V4L2_CID_SI476X_INTERCHIP_LINK: if (si476x_core_has_diversity(radio->core)) { - if (radio->ops->phase_diversity) { - retval = radio->ops->phase_div_status(radio->core); + if (!si476x_core_is_in_am_receiver_mode(radio->core)) { + retval = si476x_core_cmd_fm_phase_div_status(radio->core); if (retval < 0) break; @@ -1002,7 +990,7 @@ static int si476x_radio_s_ctrl(struct v4l2_ctrl *ctrl) radio->core->diversity_mode = mode; retval = 0; } else { - retval = radio->ops->phase_diversity(radio->core, mode); + retval = si476x_core_cmd_fm_phase_diversity(radio->core, mode); if (!retval) radio->core->diversity_mode = mode; } @@ -1256,11 +1244,11 @@ static ssize_t si476x_radio_read_rds_blckcnt_blob(struct file *file, struct si476x_rds_blockcount_report report; si476x_core_lock(radio->core); - if (radio->ops->rds_blckcnt) - err = radio->ops->rds_blckcnt(radio->core, true, - &report); - else + if (si476x_core_is_in_am_receiver_mode(radio->core)) err = -ENOENT; + else + err = si476x_core_cmd_fm_rds_blockcount(radio->core, true, + &report); si476x_core_unlock(radio->core); if (err < 0) @@ -1285,10 +1273,10 @@ static ssize_t si476x_radio_read_agc_blob(struct file *file, struct si476x_agc_status_report report; si476x_core_lock(radio->core); - if (radio->ops->rds_blckcnt) - err = radio->ops->agc_status(radio->core, &report); - else + if (si476x_core_is_in_am_receiver_mode(radio->core)) err = -ENOENT; + else + err = si476x_core_cmd_agc_status(radio->core, &report); si476x_core_unlock(radio->core); if (err < 0) @@ -1304,15 +1292,17 @@ static const struct file_operations radio_agc_fops = { .read = si476x_radio_read_agc_blob, }; -static ssize_t si476x_radio_read_rsq_blob(struct file *file, - char __user *user_buf, - size_t count, loff_t *ppos) + +static ssize_t __si476x_radio_read_rsq_blob(bool is_primary, + struct file *file, + char __user *user_buf, + size_t count, loff_t *ppos) { int err; struct si476x_radio *radio = file->private_data; struct si476x_rsq_status_report report; struct si476x_rsq_status_args args = { - .primary = false, + .primary = is_primary, .rsqack = false, .attune = false, .cancel = false, @@ -1320,7 +1310,7 @@ static ssize_t si476x_radio_read_rsq_blob(struct file *file, }; si476x_core_lock(radio->core); - if (radio->ops->rds_blckcnt) + if (radio->ops->rsq_status) err = radio->ops->rsq_status(radio->core, &args, &report); else err = -ENOENT; @@ -1331,6 +1321,14 @@ static ssize_t si476x_radio_read_rsq_blob(struct file *file, return simple_read_from_buffer(user_buf, count, ppos, &report, sizeof(report)); + +} + +static ssize_t si476x_radio_read_rsq_blob(struct file *file, + char __user *user_buf, + size_t count, loff_t *ppos) +{ + return __si476x_radio_read_rsq_blob(false, file, user_buf, count, ppos); } static const struct file_operations radio_rsq_fops = { @@ -1343,29 +1341,7 @@ static ssize_t si476x_radio_read_rsq_primary_blob(struct file *file, char __user *user_buf, size_t count, loff_t *ppos) { - int err; - struct si476x_radio *radio = file->private_data; - struct si476x_rsq_status_report report; - struct si476x_rsq_status_args args = { - .primary = true, - .rsqack = false, - .attune = false, - .cancel = false, - .stcack = false, - }; - - si476x_core_lock(radio->core); - if (radio->ops->rds_blckcnt) - err = radio->ops->rsq_status(radio->core, &args, &report); - else - err = -ENOENT; - si476x_core_unlock(radio->core); - - if (err < 0) - return err; - - return simple_read_from_buffer(user_buf, count, ppos, &report, - sizeof(report)); + return __si476x_radio_read_rsq_blob(true, file, user_buf, count, ppos); } static const struct file_operations radio_rsq_primary_fops = {