From patchwork Thu May 27 16:39:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ellingsworth X-Patchwork-Id: 102737 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4RGf7ek023699 for ; Thu, 27 May 2010 16:41:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757934Ab0E0QlF (ORCPT ); Thu, 27 May 2010 12:41:05 -0400 Received: from 99-34-136-231.lightspeed.bcvloh.sbcglobal.net ([99.34.136.231]:41818 "EHLO desource.dyndns.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757052Ab0E0Qku (ORCPT ); Thu, 27 May 2010 12:40:50 -0400 Received: from root by desource.dyndns.org with local (Exim 4.71) (envelope-from ) id 1OHg7X-0006kP-Bb; Thu, 27 May 2010 12:39:47 -0400 From: David Ellingsworth To: linux-media@vger.kernel.org Cc: Markus Demleitner , Mauro Carvalho Chehab , David Ellingsworth Subject: [PATCH/RFC v2 8/8] dsbr100: simplify access to radio device Date: Thu, 27 May 2010 12:39:16 -0400 Message-Id: <1274978356-25836-9-git-send-email-david@identd.dyndns.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <[PATCH/RFC 0/7] dsbr100: driver cleanup> References: <[PATCH/RFC 0/7] dsbr100: driver cleanup> X-SA-Exim-Connect-IP: X-SA-Exim-Rcpt-To: linux-media@vger.kernel.org, msdemlei@tucana.harvard.edu, mchehab@infradead.org, david@identd.dyndns.org X-SA-Exim-Mail-From: root@desource.dyndns.org X-SA-Exim-Scanned: No (on desource.dyndns.org); SAEximRunCond expanded to false 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.3 (demeter.kernel.org [140.211.167.41]); Thu, 27 May 2010 16:41:08 +0000 (UTC) diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c index 81e6aa5..a8c3d5a 100644 --- a/drivers/media/radio/dsbr100.c +++ b/drivers/media/radio/dsbr100.c @@ -366,7 +366,7 @@ static void usb_dsbr100_disconnect(struct usb_interface *intf) static int vidioc_querycap(struct file *file, void *priv, struct v4l2_capability *v) { - struct dsbr100_device *radio = video_drvdata(file); + struct dsbr100_device *radio = priv; strlcpy(v->driver, "dsbr100", sizeof(v->driver)); strlcpy(v->card, "D-Link R-100 USB FM Radio", sizeof(v->card)); @@ -379,7 +379,7 @@ static int vidioc_querycap(struct file *file, void *priv, static int vidioc_g_tuner(struct file *file, void *priv, struct v4l2_tuner *v) { - struct dsbr100_device *radio = video_drvdata(file); + struct dsbr100_device *radio = priv; if (v->index > 0) return -EINVAL; @@ -411,7 +411,7 @@ static int vidioc_s_tuner(struct file *file, void *priv, static int vidioc_s_frequency(struct file *file, void *priv, struct v4l2_frequency *f) { - struct dsbr100_device *radio = video_drvdata(file); + struct dsbr100_device *radio = priv; int retval = dsbr100_setfreq(radio, f->frequency); if (retval < 0) @@ -423,7 +423,7 @@ static int vidioc_s_frequency(struct file *file, void *priv, static int vidioc_g_frequency(struct file *file, void *priv, struct v4l2_frequency *f) { - struct dsbr100_device *radio = video_drvdata(file); + struct dsbr100_device *radio = priv; f->type = V4L2_TUNER_RADIO; f->frequency = radio->curfreq; @@ -444,7 +444,7 @@ static int vidioc_queryctrl(struct file *file, void *priv, static int vidioc_g_ctrl(struct file *file, void *priv, struct v4l2_control *ctrl) { - struct dsbr100_device *radio = video_drvdata(file); + struct dsbr100_device *radio = priv; switch (ctrl->id) { case V4L2_CID_AUDIO_MUTE: @@ -457,7 +457,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv, static int vidioc_s_ctrl(struct file *file, void *priv, struct v4l2_control *ctrl) { - struct dsbr100_device *radio = video_drvdata(file); + struct dsbr100_device *radio = priv; int retval; switch (ctrl->id) { @@ -518,7 +518,7 @@ static int vidioc_s_audio(struct file *file, void *priv, static long usb_dsbr100_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { - struct dsbr100_device *radio = video_drvdata(file); + struct dsbr100_device *radio = file->private_data; long retval = 0; mutex_lock(&radio->lock); @@ -556,6 +556,7 @@ static int usb_dsbr100_open(struct file *file) radio->status |= INITIALIZED; } + file->private_data = radio; unlock: mutex_unlock(&radio->lock); return retval;