From patchwork Fri Aug 30 12:29:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gianluca Gennari X-Patchwork-Id: 2851940 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B135C9F313 for ; Fri, 30 Aug 2013 12:29:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1CA3B2038C for ; Fri, 30 Aug 2013 12:29:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 08082202E6 for ; Fri, 30 Aug 2013 12:29:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755554Ab3H3M3l (ORCPT ); Fri, 30 Aug 2013 08:29:41 -0400 Received: from mail-ee0-f49.google.com ([74.125.83.49]:53681 "EHLO mail-ee0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755496Ab3H3M3k (ORCPT ); Fri, 30 Aug 2013 08:29:40 -0400 Received: by mail-ee0-f49.google.com with SMTP id d41so874887eek.22 for ; Fri, 30 Aug 2013 05:29:39 -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:in-reply-to:references; bh=aoZEJ7owFH/y2drvVeC5HN0oBz9SWQnWXumLfmIVQ4Q=; b=BIwT4hvb8PMomDcm6DJB7EC+6gvoLq8aC+rcA9zPV65WCKbGBwHoPOEZ++9WqtFs2B jg2zveuZtOo4UCvWRfN6pwC7Uue/8cpJn9C5m+SL8WkKKHywATc9lvtwcLI6wAcyVoWI xXkX2V3EFfH4tY4uWDeNbrPvzvZdzRE2dtYDoFnWstHL2BazBEMtqQhGyYZfiKhc+hrq E7lZQWTsRxZF94gkYaq65ubXCLHASzpBSCK6qUezjofh2coDHNMTno6XFUtmd2G4mBxv guPRXRqACRSJJdfueo48wrjiVwbiMsT/uvADeyIDqpxVwyni516CK9FAmR8HCX98o28l rejw== X-Received: by 10.15.26.7 with SMTP id m7mr3279149eeu.56.1377865779176; Fri, 30 Aug 2013 05:29:39 -0700 (PDT) Received: from precision.spark.local (host84-170-static.92-94-b.business.telecomitalia.it. [94.92.170.84]) by mx.google.com with ESMTPSA id r48sm54372542eev.14.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 30 Aug 2013 05:29:38 -0700 (PDT) From: Gianluca Gennari To: linux-media@vger.kernel.org, m.chehab@samsung.com, hans.verkuil@cisco.com Cc: Gianluca Gennari Subject: [PATCH 1/4] adv7842: fix compilation with GCC < 4.4.6 Date: Fri, 30 Aug 2013 14:29:22 +0200 Message-Id: <1377865765-25203-2-git-send-email-gennarone@gmail.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1377865765-25203-1-git-send-email-gennarone@gmail.com> References: <1377865765-25203-1-git-send-email-gennarone@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-8.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Gianluca Gennari --- drivers/media/i2c/adv7842.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c index d174890..22f729d 100644 --- a/drivers/media/i2c/adv7842.c +++ b/drivers/media/i2c/adv7842.c @@ -546,30 +546,24 @@ static inline bool is_digital_input(struct v4l2_subdev *sd) static const struct v4l2_dv_timings_cap adv7842_timings_cap_analog = { .type = V4L2_DV_BT_656_1120, - .bt = { - .max_width = 1920, - .max_height = 1200, - .min_pixelclock = 25000000, - .max_pixelclock = 170000000, - .standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | + /* keep this initialization for compatibility with GCC < 4.4.6 */ + .reserved = { 0 }, + V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000, + V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, - .capabilities = V4L2_DV_BT_CAP_PROGRESSIVE | - V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM, - }, + V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING | + V4L2_DV_BT_CAP_CUSTOM) }; static const struct v4l2_dv_timings_cap adv7842_timings_cap_digital = { .type = V4L2_DV_BT_656_1120, - .bt = { - .max_width = 1920, - .max_height = 1200, - .min_pixelclock = 25000000, - .max_pixelclock = 225000000, - .standards = V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | + /* keep this initialization for compatibility with GCC < 4.4.6 */ + .reserved = { 0 }, + V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000, + V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT | V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT, - .capabilities = V4L2_DV_BT_CAP_PROGRESSIVE | - V4L2_DV_BT_CAP_REDUCED_BLANKING | V4L2_DV_BT_CAP_CUSTOM, - }, + V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING | + V4L2_DV_BT_CAP_CUSTOM) }; static inline const struct v4l2_dv_timings_cap *