From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab <mchehab+huawei@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Mauro Carvalho Chehab <mchehab@kernel.org>, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev Subject: [PATCH 2/3] media: dvb header files: move some headers to staging Date: Wed, 2 Jun 2021 15:25:08 +0200 [thread overview] Message-ID: <c06e84e7d2b2da15ad5db7d65f643ee350631449.1622639751.git.mchehab+huawei@kernel.org> (raw) In-Reply-To: <cover.1622639751.git.mchehab+huawei@kernel.org> The audio, video and OSD APIs are used upstream only by the av7110 driver, which was moved to staging. So, move the corresponding header files to it. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../linux/dvb => drivers/staging/media/av7110}/audio.h | 0 drivers/staging/media/av7110/av7110.h | 7 ++++--- .../uapi/linux/dvb => drivers/staging/media/av7110}/osd.h | 0 .../linux/dvb => drivers/staging/media/av7110}/video.h | 0 4 files changed, 4 insertions(+), 3 deletions(-) rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/audio.h (100%) rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/osd.h (100%) rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/video.h (100%) diff --git a/include/uapi/linux/dvb/audio.h b/drivers/staging/media/av7110/audio.h similarity index 100% rename from include/uapi/linux/dvb/audio.h rename to drivers/staging/media/av7110/audio.h diff --git a/drivers/staging/media/av7110/av7110.h b/drivers/staging/media/av7110/av7110.h index 809d938ae166..b8e8fc8ddbe9 100644 --- a/drivers/staging/media/av7110/av7110.h +++ b/drivers/staging/media/av7110/av7110.h @@ -9,11 +9,12 @@ #include <linux/input.h> #include <linux/time.h> -#include <linux/dvb/video.h> -#include <linux/dvb/audio.h> +#include "video.h" +#include "audio.h" +#include "osd.h" + #include <linux/dvb/dmx.h> #include <linux/dvb/ca.h> -#include <linux/dvb/osd.h> #include <linux/dvb/net.h> #include <linux/mutex.h> diff --git a/include/uapi/linux/dvb/osd.h b/drivers/staging/media/av7110/osd.h similarity index 100% rename from include/uapi/linux/dvb/osd.h rename to drivers/staging/media/av7110/osd.h diff --git a/include/uapi/linux/dvb/video.h b/drivers/staging/media/av7110/video.h similarity index 100% rename from include/uapi/linux/dvb/video.h rename to drivers/staging/media/av7110/video.h -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> To: unlisted-recipients:; (no To-header on input) Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab <mchehab+huawei@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Mauro Carvalho Chehab <mchehab@kernel.org>, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev Subject: [PATCH 2/3] media: dvb header files: move some headers to staging Date: Wed, 2 Jun 2021 15:25:08 +0200 [thread overview] Message-ID: <c06e84e7d2b2da15ad5db7d65f643ee350631449.1622639751.git.mchehab+huawei@kernel.org> (raw) In-Reply-To: <cover.1622639751.git.mchehab+huawei@kernel.org> The audio, video and OSD APIs are used upstream only by the av7110 driver, which was moved to staging. So, move the corresponding header files to it. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../linux/dvb => drivers/staging/media/av7110}/audio.h | 0 drivers/staging/media/av7110/av7110.h | 7 ++++--- .../uapi/linux/dvb => drivers/staging/media/av7110}/osd.h | 0 .../linux/dvb => drivers/staging/media/av7110}/video.h | 0 4 files changed, 4 insertions(+), 3 deletions(-) rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/audio.h (100%) rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/osd.h (100%) rename {include/uapi/linux/dvb => drivers/staging/media/av7110}/video.h (100%) diff --git a/include/uapi/linux/dvb/audio.h b/drivers/staging/media/av7110/audio.h similarity index 100% rename from include/uapi/linux/dvb/audio.h rename to drivers/staging/media/av7110/audio.h diff --git a/drivers/staging/media/av7110/av7110.h b/drivers/staging/media/av7110/av7110.h index 809d938ae166..b8e8fc8ddbe9 100644 --- a/drivers/staging/media/av7110/av7110.h +++ b/drivers/staging/media/av7110/av7110.h @@ -9,11 +9,12 @@ #include <linux/input.h> #include <linux/time.h> -#include <linux/dvb/video.h> -#include <linux/dvb/audio.h> +#include "video.h" +#include "audio.h" +#include "osd.h" + #include <linux/dvb/dmx.h> #include <linux/dvb/ca.h> -#include <linux/dvb/osd.h> #include <linux/dvb/net.h> #include <linux/mutex.h> diff --git a/include/uapi/linux/dvb/osd.h b/drivers/staging/media/av7110/osd.h similarity index 100% rename from include/uapi/linux/dvb/osd.h rename to drivers/staging/media/av7110/osd.h diff --git a/include/uapi/linux/dvb/video.h b/drivers/staging/media/av7110/video.h similarity index 100% rename from include/uapi/linux/dvb/video.h rename to drivers/staging/media/av7110/video.h -- 2.31.1
next prev parent reply other threads:[~2021-06-02 13:25 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-02 13:25 [PATCH 0/3] Move audio/video/osd APIs to be together with av7110 Mauro Carvalho Chehab 2021-06-02 13:25 ` Mauro Carvalho Chehab 2021-06-02 13:25 ` [PATCH 1/3] media: ivtv: get rid of DVB deprecated ioctls Mauro Carvalho Chehab 2021-06-02 13:33 ` Hans Verkuil 2021-06-02 13:25 ` Mauro Carvalho Chehab [this message] 2021-06-02 13:25 ` [PATCH 2/3] media: dvb header files: move some headers to staging Mauro Carvalho Chehab 2021-06-02 13:25 ` [PATCH 3/3] media: docs: move DVB audio/video docs " Mauro Carvalho Chehab 2021-06-02 13:25 ` Mauro Carvalho Chehab
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=c06e84e7d2b2da15ad5db7d65f643ee350631449.1622639751.git.mchehab+huawei@kernel.org \ --to=mchehab+huawei@kernel.org \ --cc=gregkh@linuxfoundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-staging@lists.linux.dev \ --cc=linuxarm@huawei.com \ --cc=mauro.chehab@huawei.com \ --cc=mchehab@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.