From patchwork Sat Jun 11 17:48:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 872072 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5BHmjeF030841 for ; Sat, 11 Jun 2011 17:48:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753310Ab1FKRsn (ORCPT ); Sat, 11 Jun 2011 13:48:43 -0400 Received: from smtp-vbr15.xs4all.nl ([194.109.24.35]:3036 "EHLO smtp-vbr15.xs4all.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753002Ab1FKRsl (ORCPT ); Sat, 11 Jun 2011 13:48:41 -0400 Received: from tschai.lan (215.80-203-102.nextgentel.com [80.203.102.215]) (authenticated bits=0) by smtp-vbr15.xs4all.nl (8.13.8/8.13.8) with ESMTP id p5BHmbw9092582 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 11 Jun 2011 19:48:39 +0200 (CEST) (envelope-from hverkuil@xs4all.nl) From: Hans Verkuil To: linux-media@vger.kernel.org Cc: Hans Verkuil Subject: [RFCv3 PATCH 2/6] tuner-core: change return type of set_mode_freq to bool Date: Sat, 11 Jun 2011 19:48:31 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: <1307814515-17351-1-git-send-email-hverkuil@xs4all.nl> References: <1307814515-17351-1-git-send-email-hverkuil@xs4all.nl> In-Reply-To: <980897e53f7cc2ec9bbbf58d9d451ee56a249309.1307813916.git.hans.verkuil@cisco.com> References: <980897e53f7cc2ec9bbbf58d9d451ee56a249309.1307813916.git.hans.verkuil@cisco.com> X-Virus-Scanned: by XS4ALL Virus Scanner Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sat, 11 Jun 2011 17:48:45 +0000 (UTC) From: Hans Verkuil set_mode_freq currently returns 0 or -EINVAL. But -EINVAL does not indicate a error that should be passed on, it just indicates that the tuner does not support the requested mode. So change the return type to bool. Signed-off-by: Hans Verkuil --- drivers/media/video/tuner-core.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c index 083b9f1..ee43e0a 100644 --- a/drivers/media/video/tuner-core.c +++ b/drivers/media/video/tuner-core.c @@ -746,11 +746,11 @@ static bool supported_mode(struct tuner *t, enum v4l2_tuner_type mode) * @freq: frequency to set (0 means to use the previous one) * * If tuner doesn't support the needed mode (radio or TV), prints a - * debug message and returns -EINVAL, changing its state to standby. - * Otherwise, changes the state and sets frequency to the last value, if - * the tuner can sleep or if it supports both Radio and TV. + * debug message and returns false, changing its state to standby. + * Otherwise, changes the state and sets frequency to the last value + * and returns true. */ -static int set_mode_freq(struct i2c_client *client, struct tuner *t, +static bool set_mode_freq(struct i2c_client *client, struct tuner *t, enum v4l2_tuner_type mode, unsigned int freq) { struct analog_demod_ops *analog_ops = &t->fe.ops.analog_ops; @@ -762,7 +762,7 @@ static int set_mode_freq(struct i2c_client *client, struct tuner *t, t->standby = true; if (analog_ops->standby) analog_ops->standby(&t->fe); - return -EINVAL; + return false; } t->mode = mode; tuner_dbg("Changing to mode %d\n", mode); @@ -777,7 +777,7 @@ static int set_mode_freq(struct i2c_client *client, struct tuner *t, set_tv_freq(client, t->tv_freq); } - return 0; + return true; } /* @@ -1075,8 +1075,7 @@ static int tuner_s_radio(struct v4l2_subdev *sd) struct tuner *t = to_tuner(sd); struct i2c_client *client = v4l2_get_subdevdata(sd); - if (set_mode_freq(client, t, V4L2_TUNER_RADIO, 0) == -EINVAL) - return 0; + set_mode_freq(client, t, V4L2_TUNER_RADIO, 0); return 0; } @@ -1110,7 +1109,7 @@ static int tuner_s_std(struct v4l2_subdev *sd, v4l2_std_id std) struct tuner *t = to_tuner(sd); struct i2c_client *client = v4l2_get_subdevdata(sd); - if (set_mode_freq(client, t, V4L2_TUNER_ANALOG_TV, 0) == -EINVAL) + if (!set_mode_freq(client, t, V4L2_TUNER_ANALOG_TV, 0)) return 0; t->std = std; @@ -1124,9 +1123,7 @@ static int tuner_s_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *f) struct tuner *t = to_tuner(sd); struct i2c_client *client = v4l2_get_subdevdata(sd); - if (set_mode_freq(client, t, f->type, f->frequency) == -EINVAL) - return 0; - + set_mode_freq(client, t, f->type, f->frequency); return 0; } @@ -1197,7 +1194,7 @@ static int tuner_s_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *vt) struct tuner *t = to_tuner(sd); struct i2c_client *client = v4l2_get_subdevdata(sd); - if (set_mode_freq(client, t, vt->type, 0) == -EINVAL) + if (!set_mode_freq(client, t, vt->type, 0)) return 0; if (t->mode == V4L2_TUNER_RADIO)