From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB956C433ED for ; Thu, 20 May 2021 10:47:02 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5D37F61001 for ; Thu, 20 May 2021 10:47:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5D37F61001 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JsGsVFAPgPbuILig3z+vdoRCoR4k4CW2+0wxmNgkYu4=; b=LhWR/J9lTchwjyoxjDcBfllBOy T4GN0RG5pUQKEMzkGaL4L8yYzhE3psgN+ZkVEBdOlGmYwon2ppwlgW8wWvXU2YwQa9yQwIuwm8cM1 rNxLgv5GGNRLrklcY+cOsHhia/gPPT+secpWfDUx2FbupUwdhwDAxUdWvwpcZFs5x/0rle3sfthlm ppCHQRVDSF23CB57DBDqCmdlxwdZpWfMM50UYTbEmXCk22UgqdPalBWsktnPwcZq69ckxJ/+cvQFa +P/WepQyOzshbO+OueYi6A5ulM2+2gp6ZuTTqZzzYMXrdnqWwELOP6Ancm7QC30wzJ/BYy++SxEaR elxYme8w==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ljgBK-000D7h-Ah; Thu, 20 May 2021 10:45:34 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ljgAc-000Cpf-Ko for linux-arm-kernel@desiato.infradead.org; Thu, 20 May 2021 10:44:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=B5ZWzUeYqTQLFzLVEG/RxjgILJ2YZIhD7PbaUbwdicw=; b=ez97wqfZ4lfXw+092SMxbeXUTj pUdRFASHWlINBvIjv7FelJziXkrKURzBRsEjo7lAEW2MN7439oRD+t9t0nhniW9xD72HY+nOv/x9M GZu+wfx67CpKW6zePF0BnfsJUt6cxQlrax+wgEMBJV8UG72gp1BhkfgddRdlCb/jNesQscu2rKbNy tXMVAfbSN8A9ZWE35NlpV0w98Vhp12JeZ/kkyPPS0i40QHvo0r0mpD4HljRQsVLj1XtelCxZXRWvi WHM6he9xg+vbs/0Yo010+c0N7h5WZEg059PcVzh+GjFhgy6dPGVBuORqSAIwR85I4OI1R8VcJpIPJ RNvynf6w==; Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ljgAZ-00GBrH-RW for linux-arm-kernel@lists.infradead.org; Thu, 20 May 2021 10:44:49 +0000 Received: by mail-pl1-x634.google.com with SMTP id u7so223921plq.4 for ; Thu, 20 May 2021 03:44:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B5ZWzUeYqTQLFzLVEG/RxjgILJ2YZIhD7PbaUbwdicw=; b=Zpd70lXIV/eUnVrI8F4+xjxllQR6HyPP1iaCcElNF5O1IUn2zHjs9Ucbu1M9iZuNn/ 9YmiF6pX3Gfy9DMn/15SOarhogNZqzhqItsmjel2+dcIfIuTOW6hbplNW20GcoDWMaeF NDrqzILNelFbOlWqKcmwoNszt0Ijd7b/dVf5IqRLB9gpLgwchqOddFfoXkkvZm/XAceG gEY+3Hewfs12i/vSpcjxEmbUK4vkKFvyG9y7WnbFmlzQcY8yYImONbmRltNM9mibaX4h HsL6l9MFFh6ObQPecz8LoXNwcM8IwI2dXvU+EYXQuGPwa1hBeQo4Nzie51bb/A6McqJL O1kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B5ZWzUeYqTQLFzLVEG/RxjgILJ2YZIhD7PbaUbwdicw=; b=JoAE9VauZJ8SAIVTkHmdpWTfCPQrmtps6hUHFfWjsbRB2RvxD7NvgU8HjL7ghAeaJ7 Sz6n5wjOY3mSQ3MpurEnhNmh/RnkhVh6pZ9IEa+HWuAv88p+OD6Ii36u73KdMOLUSdyk bqh8zIYzjIUR5qc6vFFt2U0rQ0DkqGl85sgnzj6y6JJyhmRHR51aucQfHaYjVtof6qnk 9t1rAPFIpDDqxXtQ+mWRPFrlj5atoYOGILoox9dE7wTT39sAH8WAGQ8BX8HJtBGtdUVu eU+UdM78YdCllU3+kJS26HzzIq2f+YiTUXFhu/a/Rds5GACT5CkLa4/vvqrZ5U7upDaV 5+Bw== X-Gm-Message-State: AOAM531p8jT7rnffKT93bY0y5F9/PebfiBWNUcqvwFDVXmqibQqNwPSA fgSO7iu2/xrVEeaubYTcWzo= X-Google-Smtp-Source: ABdhPJyLlYQXZjXviGINknEFBWgEqraOFrpfGwkNKpdsDEW6vI6pdjv2iIyooBg0qMZQiifEGrFSEQ== X-Received: by 2002:a17:90a:b382:: with SMTP id e2mr4165874pjr.171.1621507486794; Thu, 20 May 2021 03:44:46 -0700 (PDT) Received: from pride.localdomain (c-174-61-140-56.hsd1.wa.comcast.net. [174.61.140.56]) by smtp.gmail.com with ESMTPSA id z12sm1762572pfk.45.2021.05.20.03.44.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 03:44:46 -0700 (PDT) From: Joe Richey To: trivial@kernel.org Cc: Joe Richey , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Paolo Bonzini , Mark Rutland , Lorenzo Pieralisi , Mauro Carvalho Chehab , Zhangfei Gao , Zhou Wang , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-accelerators@lists.ozlabs.org Subject: [PATCH 5/6] media: vicodec: Don't use BIT() macro in UAPI headers Date: Thu, 20 May 2021 03:43:42 -0700 Message-Id: <20210520104343.317119-6-joerichey94@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520104343.317119-1-joerichey94@gmail.com> References: <20210520104343.317119-1-joerichey94@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210520_034447_902075_56AA6C56 X-CRM114-Status: GOOD ( 19.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Joe Richey A previous patch [1] used the BIT() macro to define the V4L2_FWHT_FL_* constants in the UAPI header file. This macro is defined in the kernel but not in the UAPI headers. Seems like this was caused by moving code from inside the kernel. [1] https://lore.kernel.org/patchwork/patch/11933745/ Signed-off-by: Joe Richey --- include/uapi/linux/v4l2-controls.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index d43bec5f1afd..6ecefeceba9d 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -1602,30 +1602,30 @@ struct v4l2_ctrl_h264_decode_params { #define V4L2_FWHT_VERSION 3 /* Set if this is an interlaced format */ -#define V4L2_FWHT_FL_IS_INTERLACED BIT(0) +#define V4L2_FWHT_FL_IS_INTERLACED (1 << 0) /* Set if this is a bottom-first (NTSC) interlaced format */ -#define V4L2_FWHT_FL_IS_BOTTOM_FIRST BIT(1) +#define V4L2_FWHT_FL_IS_BOTTOM_FIRST (1 << 1) /* Set if each 'frame' contains just one field */ -#define V4L2_FWHT_FL_IS_ALTERNATE BIT(2) +#define V4L2_FWHT_FL_IS_ALTERNATE (1 << 2) /* * If V4L2_FWHT_FL_IS_ALTERNATE was set, then this is set if this * 'frame' is the bottom field, else it is the top field. */ -#define V4L2_FWHT_FL_IS_BOTTOM_FIELD BIT(3) +#define V4L2_FWHT_FL_IS_BOTTOM_FIELD (1 << 3) /* Set if the Y' plane is uncompressed */ -#define V4L2_FWHT_FL_LUMA_IS_UNCOMPRESSED BIT(4) +#define V4L2_FWHT_FL_LUMA_IS_UNCOMPRESSED (1 << 4) /* Set if the Cb plane is uncompressed */ -#define V4L2_FWHT_FL_CB_IS_UNCOMPRESSED BIT(5) +#define V4L2_FWHT_FL_CB_IS_UNCOMPRESSED (1 << 5) /* Set if the Cr plane is uncompressed */ -#define V4L2_FWHT_FL_CR_IS_UNCOMPRESSED BIT(6) +#define V4L2_FWHT_FL_CR_IS_UNCOMPRESSED (1 << 6) /* Set if the chroma plane is full height, if cleared it is half height */ -#define V4L2_FWHT_FL_CHROMA_FULL_HEIGHT BIT(7) +#define V4L2_FWHT_FL_CHROMA_FULL_HEIGHT (1 << 7) /* Set if the chroma plane is full width, if cleared it is half width */ -#define V4L2_FWHT_FL_CHROMA_FULL_WIDTH BIT(8) +#define V4L2_FWHT_FL_CHROMA_FULL_WIDTH (1 << 8) /* Set if the alpha plane is uncompressed */ -#define V4L2_FWHT_FL_ALPHA_IS_UNCOMPRESSED BIT(9) +#define V4L2_FWHT_FL_ALPHA_IS_UNCOMPRESSED (1 << 9) /* Set if this is an I Frame */ -#define V4L2_FWHT_FL_I_FRAME BIT(10) +#define V4L2_FWHT_FL_I_FRAME (1 << 10) /* A 4-values flag - the number of components - 1 */ #define V4L2_FWHT_FL_COMPONENTS_NUM_MSK GENMASK(18, 16) -- 2.31.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel