From patchwork Wed Jul 29 15:18:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 38172 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6TFIOpO006390 for ; Wed, 29 Jul 2009 15:18:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752833AbZG2PSW (ORCPT ); Wed, 29 Jul 2009 11:18:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752875AbZG2PSW (ORCPT ); Wed, 29 Jul 2009 11:18:22 -0400 Received: from mail.gmx.net ([213.165.64.20]:59733 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752833AbZG2PSV (ORCPT ); Wed, 29 Jul 2009 11:18:21 -0400 Received: (qmail invoked by alias); 29 Jul 2009 15:18:19 -0000 Received: from p57BD160F.dip0.t-ipconnect.de (EHLO axis700.grange) [87.189.22.15] by mail.gmx.net (mp040) with SMTP; 29 Jul 2009 17:18:19 +0200 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX1/YAQgkli3YOdFj1571LX6JSfNzw/IPXjJlrfqjYm +bfETgWPnMdCtV Received: from lyakh (helo=localhost) by axis700.grange with local-esmtp (Exim 4.63) (envelope-from ) id 1MWAvI-0002Df-3x; Wed, 29 Jul 2009 17:18:32 +0200 Date: Wed, 29 Jul 2009 17:18:32 +0200 (CEST) From: Guennadi Liakhovetski To: Linux Media Mailing List cc: Magnus Damm , m-karicheri2@ti.com, Valentin Longchamp , Robert Jarzmik , Paulius Zaleckas , Darius Augulis Subject: [PATCH 2/4] soc-camera: Use camera device object for core output In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Y-GMX-Trusted: 0 X-FuHaFi: 0.55 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Signed-off-by: Guennadi Liakhovetski --- drivers/media/video/soc_camera.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index dd023bd..c6cccdf 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c @@ -297,7 +297,7 @@ static int soc_camera_set_fmt(struct soc_camera_file *icf, return ret; } else if (!icd->current_fmt || icd->current_fmt->fourcc != pix->pixelformat) { - dev_err(ici->v4l2_dev.dev, + dev_err(&icd->dev, "Host driver hasn't set up current format correctly!\n"); return -EINVAL; } @@ -426,7 +426,6 @@ static int soc_camera_close(struct file *file) struct soc_camera_file *icf = file->private_data; struct soc_camera_device *icd = icf->icd; struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent); - struct video_device *vdev = icd->vdev; mutex_lock(&icd->video_lock); icd->use_count--; @@ -446,7 +445,7 @@ static int soc_camera_close(struct file *file) vfree(icf); - dev_dbg(vdev->parent, "camera device close\n"); + dev_dbg(&icd->dev, "camera device close\n"); return 0; } @@ -456,10 +455,9 @@ static ssize_t soc_camera_read(struct file *file, char __user *buf, { struct soc_camera_file *icf = file->private_data; struct soc_camera_device *icd = icf->icd; - struct video_device *vdev = icd->vdev; int err = -EINVAL; - dev_err(vdev->parent, "camera device read not implemented\n"); + dev_err(&icd->dev, "camera device read not implemented\n"); return err; }