From patchwork Mon Feb 22 20:47:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 8382911 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F06E19F2F0 for ; Mon, 22 Feb 2016 20:47:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C981A2040F for ; Mon, 22 Feb 2016 20:47:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB4E620382 for ; Mon, 22 Feb 2016 20:47:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755542AbcBVUrJ (ORCPT ); Mon, 22 Feb 2016 15:47:09 -0500 Received: from nblzone-211-213.nblnetworks.fi ([83.145.211.213]:49816 "EHLO hillosipuli.retiisi.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752159AbcBVUrI (ORCPT ); Mon, 22 Feb 2016 15:47:08 -0500 Received: from lanttu.localdomain (lanttu-e.localdomain [192.168.1.64]) by hillosipuli.retiisi.org.uk (Postfix) with ESMTP id 1CD8D600A1; Mon, 22 Feb 2016 22:47:05 +0200 (EET) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: mchehab@osg.samsung.com, hverkuil@xs4all.nl, shuahkh@osg.samsung.com, laurent.pinchart@ideasonboard.com, Sakari Ailus Subject: [PATCH v2 2/4] media: Rearrange the fields in the G_TOPOLOGY IOCTL argument Date: Mon, 22 Feb 2016 22:47:02 +0200 Message-Id: <1456174024-11389-3-git-send-email-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1456174024-11389-1-git-send-email-sakari.ailus@linux.intel.com> References: <1456174024-11389-1-git-send-email-sakari.ailus@linux.intel.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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 From: Sakari Ailus This avoids having multiple reserved fields in the struct. Reserved fields are added in order to align the struct size to a power of two as well. Signed-off-by: Sakari Ailus --- include/uapi/linux/media.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 1468651..65991df 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -341,21 +341,16 @@ struct media_v2_link { struct media_v2_topology { __u64 topology_version; - __u32 num_entities; - __u32 reserved1; __u64 ptr_entities; - - __u32 num_interfaces; - __u32 reserved2; __u64 ptr_interfaces; - - __u32 num_pads; - __u32 reserved3; __u64 ptr_pads; + __u64 ptr_links; + __u32 num_entities; + __u32 num_interfaces; + __u32 num_pads; __u32 num_links; - __u32 reserved4; - __u64 ptr_links; + __u32 reserved[18]; }; static inline void __user *media_get_uptr(__u64 arg)