Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp1479090pxb; Fri, 13 Nov 2020 13:57:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJxy+9d/tCjPu7zvMMHpgL75Ygjcqc4JQJrqbKq3/D6i4g1uh4c5GhTu1xGP8P5KLwgm2AdT X-Received: by 2002:a17:906:bce6:: with SMTP id op6mr4002556ejb.2.1605304639824; Fri, 13 Nov 2020 13:57:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605304639; cv=none; d=google.com; s=arc-20160816; b=uAuwFjEHo9dVM3oMY6Om727xGUtTgRHhUFcWFRjJ3ydjI8xlHEYh/cvgtuvN8fnv0t mt3kqeHQJVs/GQkpyBxiuCNk++C9PAfwvUGqqTwx9tTAudg6AMHNcw9dyj8vJdTm0b9p CBdbl4vMnjfWe4/qzoIUzIk7YILDNpdY9RRi5RM6waSCBk76nomvnCIEMU9DLHT8q/Ob NcoloMLRANfOdpdFU0MUmInpriw8uyNzgji6wgRQ40zb5TzrQYJPCw8oyLR3XuCTDolH xD4hPmCb+feQ0YDiMS43OhElfugw4Pzgg65vZYASe3HNnxyysVKG4g/cVzhDzkqd75pJ s8qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=mipj9hBF2oddxwUJhEwMSlYAtWu8k8gnWGMThMkA6lM=; b=Oozr5XwIjjLcXPNh2PQXzZfZnySG/nIVoKwSk5Uwv9yjHM6nX/otkjKqqzaX8p0g80 9652FxCfaPWoQdqh9tJcM4mr3clQRVyER625MvoFi4PnJIWrAkUbidt20g9uIQy5LO6Q niaiE2CSzQOYzW2QA5ZEhdSjPDzFLIBQc4xVLYBO4UMnrBV/iEr8Q5RCN5laOQN4v3zM YH9o2Fkvsoc0FkiYgl7nZGDOS4e7xeSH5QPsQRID5ogw3o6lk0X0mUulrjiEZXBnRO3k +KKv/eJuXR+Tnw3v/hQI/IRD49Q3aT/S1Tq8ZnKMKkEgo1VZLNalGv0ZlZGd9P0mZ7yP nuow== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d8si7142706edn.471.2020.11.13.13.56.56; Fri, 13 Nov 2020 13:57:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726359AbgKMVwo (ORCPT + 99 others); Fri, 13 Nov 2020 16:52:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726357AbgKMVvx (ORCPT ); Fri, 13 Nov 2020 16:51:53 -0500 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 807E2C0613D1; Fri, 13 Nov 2020 13:51:53 -0800 (PST) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ezequiel) with ESMTPSA id 846771F46BB5 From: Ezequiel Garcia To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kernel@collabora.com, Jonas Karlman , Hans Verkuil , Nicolas Dufresne , Philipp Zabel , Maxime Ripard , Paul Kocialkowski , Jernej Skrabec , Ezequiel Garcia Subject: [PATCH v2 4/9] media: Clean stateless control includes Date: Fri, 13 Nov 2020 18:51:16 -0300 Message-Id: <20201113215121.505173-5-ezequiel@collabora.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201113215121.505173-1-ezequiel@collabora.com> References: <20201113215121.505173-1-ezequiel@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Avoid including h264-ctrls.h, vp8-ctrls.h, etc, and instead just include v4l2-ctrls.h which does the right thing. This is in preparation for moving the stateless controls out of staging, which will mean removing some of these headers. Signed-off-by: Ezequiel Garcia --- drivers/staging/media/hantro/hantro_hw.h | 4 +--- include/media/v4l2-h264.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/media/hantro/hantro_hw.h b/drivers/staging/media/hantro/hantro_hw.h index 219283a06f52..34c9e4649a25 100644 --- a/drivers/staging/media/hantro/hantro_hw.h +++ b/drivers/staging/media/hantro/hantro_hw.h @@ -11,9 +11,7 @@ #include #include -#include -#include -#include +#include #include #define DEC_8190_ALIGN_MASK 0x07U diff --git a/include/media/v4l2-h264.h b/include/media/v4l2-h264.h index f08ba181263d..d2314f4d4490 100644 --- a/include/media/v4l2-h264.h +++ b/include/media/v4l2-h264.h @@ -10,7 +10,7 @@ #ifndef _MEDIA_V4L2_H264_H #define _MEDIA_V4L2_H264_H -#include +#include /** * struct v4l2_h264_reflist_builder - Reference list builder object -- 2.27.0