From: Johannes Thumshirn <jthumshirn@suse.de>
To: Hans Verkuil <hans.verkuil@cisco.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Linux Kernel Mailinglist <linux-kernel@vger.kernel.org>,
linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
devel@driverdev.osuosl.org, linux-fbdev@vger.kernel.org,
Johannes Thumshirn <jthumshirn@suse.de>
Subject: [PATCH 2/7] video: fbdev: don't use KERNEL_VERSION macro for MEDIA_REVISION
Date: Sat, 10 Jun 2017 11:05:31 +0200 [thread overview]
Message-ID: <20170610090536.12472-3-jthumshirn@suse.de> (raw)
In-Reply-To: <20170610090536.12472-1-jthumshirn@suse.de>
Don't use the KERNEL_VERSION() macro for the v4l2 capabilities, use
MEDIA_REVISION instead.
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
drivers/video/fbdev/matrox/matroxfb_base.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
index 11eb094396ae..eb92a325033c 100644
--- a/drivers/video/fbdev/matrox/matroxfb_base.c
+++ b/drivers/video/fbdev/matrox/matroxfb_base.c
@@ -113,6 +113,7 @@
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/uaccess.h>
+#include <linux/media.h>
#ifdef CONFIG_PPC_PMAC
#include <asm/machdep.h>
@@ -1091,7 +1092,7 @@ static int matroxfb_ioctl(struct fb_info *info,
strcpy(r.driver, "matroxfb");
strcpy(r.card, "Matrox");
sprintf(r.bus_info, "PCI:%s", pci_name(minfo->pcidev));
- r.version = KERNEL_VERSION(1,0,0);
+ r.version = MEDIA_REVISION(1, 0, 0);
r.capabilities = V4L2_CAP_VIDEO_OUTPUT;
if (copy_to_user(argp, &r, sizeof(r)))
return -EFAULT;
--
2.12.3
next prev parent reply other threads:[~2017-06-10 9:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-10 9:05 [PATCH 0/7] Introduce MEDIA_VERSION to end KENREL_VERSION abuse in media Johannes Thumshirn
2017-06-10 9:05 ` [PATCH 1/7] [media] media: introduce MEDIA_REVISION macro Johannes Thumshirn
2017-06-10 9:05 ` Johannes Thumshirn [this message]
2017-06-10 9:05 ` [PATCH 3/7] [media] media: document the use of MEDIA_REVISION instead of KERNEL_VERSION Johannes Thumshirn
2017-06-10 9:05 ` [PATCH 4/7] [media] cx25821: use " Johannes Thumshirn
2017-06-10 9:05 ` [PATCH 5/7] [media] media: s3c-camif: Use MEDIA_REVISON " Johannes Thumshirn
2017-06-10 9:05 ` [PATCH 6/7] [media] media: bcm2048: use MEDIA_REVISION isntead " Johannes Thumshirn
2017-06-10 9:05 ` [PATCH 7/7] staging/atomisp: use MEDIA_VERSION instead " Johannes Thumshirn
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=20170610090536.12472-3-jthumshirn@suse.de \
--to=jthumshirn@suse.de \
--cc=devel@driverdev.osuosl.org \
--cc=hans.verkuil@cisco.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®