From patchwork Mon Oct 26 23:01:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 7492421 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 004C8BEEA4 for ; Mon, 26 Oct 2015 23:03:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 27E2C20862 for ; Mon, 26 Oct 2015 23:03:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 443C42085B for ; Mon, 26 Oct 2015 23:03:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751988AbbJZXDu (ORCPT ); Mon, 26 Oct 2015 19:03:50 -0400 Received: from nblzone-211-213.nblnetworks.fi ([83.145.211.213]:44992 "EHLO hillosipuli.retiisi.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751741AbbJZXDt (ORCPT ); Mon, 26 Oct 2015 19:03:49 -0400 Received: from lanttu.localdomain (lanttu.localdomain [192.168.5.64]) by hillosipuli.retiisi.org.uk (Postfix) with ESMTP id 0E9A76009F; Tue, 27 Oct 2015 01:03:44 +0200 (EET) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, javier@osg.samsung.com, mchehab@osg.samsung.com, hverkuil@xs4all.nl Subject: [PATCH 04/19] media: Move struct media_entity_graph definition up Date: Tue, 27 Oct 2015 01:01:35 +0200 Message-Id: <1445900510-1398-5-git-send-email-sakari.ailus@iki.fi> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445900510-1398-1-git-send-email-sakari.ailus@iki.fi> References: <1445900510-1398-1-git-send-email-sakari.ailus@iki.fi> 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 It will be needed in struct media_pipeline shortly. Signed-off-by: Sakari Ailus Reviewed-by: Mauro Carvalho Chehab --- include/media/media-entity.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/media/media-entity.h b/include/media/media-entity.h index fc54192..dde9a5f 100644 --- a/include/media/media-entity.h +++ b/include/media/media-entity.h @@ -87,6 +87,16 @@ struct media_entity_enum { int idx_max; }; +struct media_entity_graph { + struct { + struct media_entity *entity; + struct list_head *link; + } stack[MEDIA_ENTITY_ENUM_MAX_DEPTH]; + + DECLARE_BITMAP(entities, MEDIA_ENTITY_ENUM_MAX_ID); + int top; +}; + struct media_pipeline { }; @@ -429,16 +439,6 @@ static inline bool media_entity_enum_intersects(struct media_entity_enum *e, return bitmap_intersects(e->e, f->e, min(e->idx_max, f->idx_max)); } -struct media_entity_graph { - struct { - struct media_entity *entity; - struct list_head *link; - } stack[MEDIA_ENTITY_ENUM_MAX_DEPTH]; - - DECLARE_BITMAP(entities, MEDIA_ENTITY_ENUM_MAX_ID); - int top; -}; - #define gobj_to_entity(gobj) \ container_of(gobj, struct media_entity, graph_obj)