From patchwork Sat Mar 22 13:01:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 23182 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 1WRLXe-0007S8-Su; Sat, 22 Mar 2014 14:00:50 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-5) with esmtp id 1WRLXc-0003cm-8F; Sat, 22 Mar 2014 14:00:50 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750983AbaCVNAn (ORCPT + 1 other); Sat, 22 Mar 2014 09:00:43 -0400 Received: from mail-ee0-f45.google.com ([74.125.83.45]:40321 "EHLO mail-ee0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750826AbaCVNAh (ORCPT ); Sat, 22 Mar 2014 09:00:37 -0400 Received: by mail-ee0-f45.google.com with SMTP id d17so2732991eek.4 for ; Sat, 22 Mar 2014 06:00:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=CiDs15GFC6dSvUMHKs5inMmXmzqGG7bkfqdxS+4y8T8=; b=UNgBk2eqKnlRLJV7EQxzG/EKjofrWE7AJFKdIOGt+BhN24WjpenWVqenm3k8Z/weNU 5I1ODEnt3zCl0RWyiVOaIoxKSNiX20eYvqiR9ypdrAsBEzfnIGtOcRceaNibH+4UqVVf YoD/J0xO1xWu2HDf6cfi9pR0Qsrr3B7Y8z2GhfziSRm5bFwSW/v0luozv03FC+RnxX49 wLYSt91zH0m0x/O7pbWcdvy3UbieMmIPpO2YqLk+69fSuE0uCHMT/r0iIRHAOQdrQ45i RrzFXmoz0xt7CmzGAcWiuN+4ebzyHVKq9e8rEmn+wVC9m2YdtyyTrY3OCEi9mm6rGafO 7PBg== X-Received: by 10.15.49.65 with SMTP id i41mr2366949eew.87.1395493236367; Sat, 22 Mar 2014 06:00:36 -0700 (PDT) Received: from Athlon64X2-5000.site (ip-81-210-162-48.unitymediagroup.de. [81.210.162.48]) by mx.google.com with ESMTPSA id h47sm10902164eey.13.2014.03.22.06.00.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Mar 2014 06:00:35 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: m.chehab@samsung.com Cc: linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH 5/5] em28xx: move norm_maxw() and norm_maxh() from em28xx.h to em28xx-video.c Date: Sat, 22 Mar 2014 14:01:03 +0100 Message-Id: <1395493263-2158-5-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.8.4.5 In-Reply-To: <1395493263-2158-1-git-send-email-fschaefer.oss@googlemail.com> References: <1395493263-2158-1-git-send-email-fschaefer.oss@googlemail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.3.22.124814 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, CT_TEXT_PLAIN_UTF8_CAPS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SXL_SIG_ERROR_SERVFAIL , __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Signed-off-by: Frank Schäfer --- drivers/media/usb/em28xx/em28xx-video.c | 23 +++++++++++++++++++++++ drivers/media/usb/em28xx/em28xx.h | 22 ---------------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index e15ac75..ac499ae 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c @@ -141,6 +141,29 @@ static struct em28xx_fmt format[] = { }, }; +/*FIXME: maxw should be dependent of alt mode */ +static inline unsigned int norm_maxw(struct em28xx *dev) +{ + if (dev->board.is_webcam) + return dev->sensor_xres; + + if (dev->board.max_range_640_480) + return 640; + + return 720; +} + +static inline unsigned int norm_maxh(struct em28xx *dev) +{ + if (dev->board.is_webcam) + return dev->sensor_yres; + + if (dev->board.max_range_640_480) + return 480; + + return (dev->norm & V4L2_STD_625_50) ? 576 : 480; +} + static int em28xx_vbi_supported(struct em28xx *dev) { /* Modprobe option to manually disable */ diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h index dd6190c..4beb1fa 100644 --- a/drivers/media/usb/em28xx/em28xx.h +++ b/drivers/media/usb/em28xx/em28xx.h @@ -793,26 +793,4 @@ int em28xx_init_camera(struct em28xx *dev); printk(KERN_WARNING "%s: "fmt,\ dev->name , ##arg); } while (0) -/*FIXME: maxw should be dependent of alt mode */ -static inline unsigned int norm_maxw(struct em28xx *dev) -{ - if (dev->board.is_webcam) - return dev->sensor_xres; - - if (dev->board.max_range_640_480) - return 640; - - return 720; -} - -static inline unsigned int norm_maxh(struct em28xx *dev) -{ - if (dev->board.is_webcam) - return dev->sensor_yres; - - if (dev->board.max_range_640_480) - return 480; - - return (dev->norm & V4L2_STD_625_50) ? 576 : 480; -} #endif