From patchwork Wed Aug 22 21:03:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 13992 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1T4I5c-00069T-LU for patchwork@linuxtv.org; Wed, 22 Aug 2012 23:03:48 +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-4) with esmtp for id 1T4I5c-0001s0-9j; Wed, 22 Aug 2012 23:03:48 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933346Ab2HVVDp (ORCPT ); Wed, 22 Aug 2012 17:03:45 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:51715 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933330Ab2HVVDo (ORCPT ); Wed, 22 Aug 2012 17:03:44 -0400 Received: by weyx8 with SMTP id x8so19786wey.19 for ; Wed, 22 Aug 2012 14:03:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=d/zGSi5f/wPq0eNdOqcUohijWCJnqjocoAtRyW/zkpI=; b=OfOCPHv5CpMuJP4Xay9QQJJ21m5r7Bm5Q+Xcgx9vxQvz/3IzfbfSPvIl2xtYrVVkz4 s3gE3JX0wkmmYP2GPlQP29YrPPASQLsrqtI99TG9RVLJZfMc3o9fkAG7oi1gxwRW9I++ TAB2/qwu1FnejQFw6ff6CSE8RBXw/FzxeAV9Dw/nin1AqEE8jOfzuCTczfe3fB0Ks0AI GF47L8UG6KcSaowhyfhS1hyGQ+L6wrem1zgFKaiSbwABfI1KreIWlxeddLVYzk2ZC2Rt vZzwnTQS9rggYH/i3HRLQPMMscCZEK9iTXWiybvEzZCNqzaTW7/Uj3LwASdPa1cjPdqO Fn4A== Received: by 10.180.82.39 with SMTP id f7mr8913212wiy.2.1345669423737; Wed, 22 Aug 2012 14:03:43 -0700 (PDT) Received: from localhost.localdomain (031011252076.warszawa.vectranet.pl. [31.11.252.76]) by mx.google.com with ESMTPS id z11sm15335637wiv.10.2012.08.22.14.03.42 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 22 Aug 2012 14:03:43 -0700 (PDT) From: Sylwester Nawrocki To: g.liakhovetski@gmx.de Cc: linux-media@vger.kernel.org, Sylwester Nawrocki Subject: [PATCH] soc-camera: Use new selection target definitions Date: Wed, 22 Aug 2012 23:03:30 +0200 Message-Id: <1345669410-31836-1-git-send-email-sylvester.nawrocki@gmail.com> X-Mailer: git-send-email 1.7.4.1 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: 2012.8.22.204821 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, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1700_1799 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 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, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Replace the deprecated V4L2_SEL_TGT_*_ACTIVE selection target names with their new unified counterparts. Compatibility definitions are already in linux/v4l2-common.h. Signed-off-by: Sylwester Nawrocki --- drivers/media/platform/soc_camera/soc_camera.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c index 10b57f8..ba62960 100644 --- a/drivers/media/platform/soc_camera/soc_camera.c +++ b/drivers/media/platform/soc_camera/soc_camera.c @@ -950,11 +950,11 @@ static int soc_camera_s_selection(struct file *file, void *fh, /* In all these cases cropping emulation will not help */ if (s->type != V4L2_BUF_TYPE_VIDEO_CAPTURE || - (s->target != V4L2_SEL_TGT_COMPOSE_ACTIVE && - s->target != V4L2_SEL_TGT_CROP_ACTIVE)) + (s->target != V4L2_SEL_TGT_COMPOSE && + s->target != V4L2_SEL_TGT_CROP)) return -EINVAL; - if (s->target == V4L2_SEL_TGT_COMPOSE_ACTIVE) { + if (s->target == V4L2_SEL_TGT_COMPOSE) { /* No output size change during a running capture! */ if (is_streaming(ici, icd) && (icd->user_width != s->r.width || @@ -974,7 +974,7 @@ static int soc_camera_s_selection(struct file *file, void *fh, ret = ici->ops->set_selection(icd, s); if (!ret && - s->target == V4L2_SEL_TGT_COMPOSE_ACTIVE) { + s->target == V4L2_SEL_TGT_COMPOSE) { icd->user_width = s->r.width; icd->user_height = s->r.height; if (!icd->streamer)