From patchwork Mon Oct 26 23:01:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 7492471 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 510DC9F36A for ; Mon, 26 Oct 2015 23:04:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8AEF820862 for ; Mon, 26 Oct 2015 23:04:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0326720861 for ; Mon, 26 Oct 2015 23:04:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752243AbbJZXD5 (ORCPT ); Mon, 26 Oct 2015 19:03:57 -0400 Received: from nblzone-211-213.nblnetworks.fi ([83.145.211.213]:45019 "EHLO hillosipuli.retiisi.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751877AbbJZXDx (ORCPT ); Mon, 26 Oct 2015 19:03:53 -0400 Received: from lanttu.localdomain (lanttu.localdomain [192.168.5.64]) by hillosipuli.retiisi.org.uk (Postfix) with ESMTP id E31D7600AE; Tue, 27 Oct 2015 01:03:46 +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 19/19] media: Rename MEDIA_ENTITY_ENUM_MAX_ID as MEDIA_ENTITY_ENUM_STACK_ALLOC Date: Tue, 27 Oct 2015 01:01:50 +0200 Message-Id: <1445900510-1398-20-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 The purpose of the macro has changed, rename it accordingly. It is not and should no longer be used in drivers directly, but only for the purpose for defining how many bits can be allocated from the stack for entity enumerations. Signed-off-by: Sakari Ailus --- drivers/media/media-entity.c | 2 +- include/media/media-entity.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c index 137aa09d..feca976 100644 --- a/drivers/media/media-entity.c +++ b/drivers/media/media-entity.c @@ -222,7 +222,7 @@ void media_gobj_remove(struct media_gobj *gobj) */ int __media_entity_enum_init(struct media_entity_enum *e, int idx_max) { - if (idx_max > MEDIA_ENTITY_ENUM_MAX_ID) { + if (idx_max > MEDIA_ENTITY_ENUM_STACK_ALLOC) { e->e = kcalloc(DIV_ROUND_UP(idx_max, BITS_PER_LONG), sizeof(long), GFP_KERNEL); if (!e->e) diff --git a/include/media/media-entity.h b/include/media/media-entity.h index cc01e08..5cab165 100644 --- a/include/media/media-entity.h +++ b/include/media/media-entity.h @@ -72,17 +72,17 @@ struct media_gobj { }; #define MEDIA_ENTITY_ENUM_MAX_DEPTH 16 -#define MEDIA_ENTITY_ENUM_MAX_ID 64 +#define MEDIA_ENTITY_ENUM_STACK_ALLOC 64 /* * The number of pads can't be bigger than the number of entities, * as the worse-case scenario is to have one entity linked up to - * MEDIA_ENTITY_ENUM_MAX_ID - 1 entities. + * MEDIA_ENTITY_ENUM_STACK_ALLOC - 1 entities. */ -#define MEDIA_ENTITY_MAX_PADS (MEDIA_ENTITY_ENUM_MAX_ID - 1) +#define MEDIA_ENTITY_MAX_PADS (MEDIA_ENTITY_ENUM_STACK_ALLOC - 1) struct media_entity_enum { - DECLARE_BITMAP(__e, MEDIA_ENTITY_ENUM_MAX_ID); + DECLARE_BITMAP(__e, MEDIA_ENTITY_ENUM_STACK_ALLOC); unsigned long *e; int idx_max; };