From patchwork Thu Jan 4 10:31:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 123402 Delivered-To: patch@linaro.org Received: by 10.80.135.92 with SMTP id 28csp6546283edv; Thu, 4 Jan 2018 02:32:26 -0800 (PST) X-Google-Smtp-Source: ACJfBot7AULdkXyuoDqAUBgYGTikGU4KnDliyZZRvU/C8tw27TXKIaXSMB6+fzb9A5PUD1GxKJJF X-Received: by 10.84.252.150 with SMTP id y22mr4224076pll.332.1515061946713; Thu, 04 Jan 2018 02:32:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515061946; cv=none; d=google.com; s=arc-20160816; b=Je7jMfnmQaBAABaRzgEt3m6fOWD+9sssmqfZlwT8/lgPhAvG4KSIVgm+o/3MIrWrh2 dWmEYFGUodwFgRNC92CyDbKTEFuTfiEYogoUsMGhjqn6UrqKGIy5zMnlTTwtIUSnzLa1 p7M0yhjOy/IyvSszMntndV8d3Vc4pTyNTdb4xs1kG1q4eTYmm/TH3oDbyRrmXYMOVsdC HZcNKaPbRLVPxBjUCBV4PUxoFpBdzvrNPvY2Bq+PkrPfXBh6XD3SRvZCcgvDd1D4C/Cj Dr8hIi7aA8IYZbQPOyGpI+PXbUoxax9ofVrARKxbLtKOGWn9qXFzmL/eyn0DyyDnTHMt JiRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=mlEdnFRdALTc2zs+MaTfZVo7a3+gkLxzvn9PpYIYSbI=; b=ejAlvGSnZa9gJVdgWsLckjcT/I4Glir1y/Q8RWFGz2DrWQHWA0Ox6mqET3EwltjJ2n MYLnC19L7veMBy7J2daf9ZT0RXgqVaeX6XNARlj/pfB3n4c3DnPt6cDXQTe7JEUh/OOb Lc2O+0bzNrjlZ0as1sQ0Aps3Gvul1TppUgLnj2jTrtzvIhzOz/PIDY17HHFRcVHUQ+XR 6taCegtpXoUyoUGJjasleUkq4TR5DOnU50bK0CzzZ6YRJcEAnka2VSt+L1mGPw+FPYGM yaKr0n9IeJkuiMjqgXCuXGg8HCmIn2xKPqaIu35B12gcPBwLY29FdJNj8xXEbjSoxiD0 aIFw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c1si1900474pgv.157.2018.01.04.02.32.26; Thu, 04 Jan 2018 02:32:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752710AbeADKcW (ORCPT + 28 others); Thu, 4 Jan 2018 05:32:22 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:56577 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752159AbeADKcV (ORCPT ); Thu, 4 Jan 2018 05:32:21 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Ly6KL-1f1HRF2E3J-015ZBR; Thu, 04 Jan 2018 11:32:16 +0100 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Arnd Bergmann , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] media: dvb: fix DVB_MMAP symbol name Date: Thu, 4 Jan 2018 11:31:30 +0100 Message-Id: <20180104103215.15591-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:UIdfcyp9TOB9l5AFnkC7mJ//DsyjVlWj4gJrb+ZBTHCUJybDtxr S78Blj5qPWbrQg+Yo8uNF7zm+8ArLcB+ax5c4bMYurYHUvWzwrueXTyRNLrXdLkXYoAVKc5 /Ndph2Ucj/IcJb5aPpQNsWhTIZLDTenjHVV/XycbtjGVbGqB1gpW4Yg/GpC5aCCu+NETsBB 4d6IXGAivHLO9sfkSyhnw== X-UI-Out-Filterresults: notjunk:1; V01:K0:nZrP0UVBLWM=:zs8PkCWd7zv5sreaH2lee7 /dBKCfM2x9M7mj08Y6lmRCTaxuwv0AmKYHEH51+7smxK323hgDVWQK7xSQjr3Iy2kSmeGae4M aHiWd2w7rsUH61CTXfoJr4nIW6PP0aVjFBV+9e+VY3vyLYItYntDscZ2Gx4vsRNkMSVL9t3de H48z3OlT/YTntq/4fT4s1DbTNqqD5TFCSIseZjGGI/hDfkqtziehNhRd6E/SasKBkUmlXV+Dx aXEe678kNUyuJkivKekJ6jpdDPfiE/P8el04dKLbenOtJ7ZxhOc+QCEmv+NzHQLw7qqPgumKo KlMaf7XhOMSbHqHvIVcu1z8azGaIEAAhI5lIJ8p44tG/ixQadYfRvpEAKC2ycUwHe7+SqX/ir G7f+ZuA0zM7ZnbbmEpiLzu6oHxFnbaoi5JSYnSlpLXWwuhyGSbpgQDLSYFKjk8YzjiptAdM7G TE1tE8aSOJ3eOidi2I1KZEuU6HfQEXlTlKyebo+B/pMPJiy/1POfO1edFR+B1I3VzI3ArYlYM mPSviXtJged72/La9494+/J/OUXryilISlFDxy5feRZ4jhxpZVwa+zINpuR4grimuVid3QREU HCzqQXKcDuy7bmb9480W1tbyhjlqMhcwoPXjNBpa4sMrlLXUyPlqCCkH7dLW6tuMxPGcalU5f 7BMGpbdxA4lK1u5d7xguXu05vFlByZayVufL4iGAc6iKiw1tqZjWw6O94ifHnb5KdpfOloSMo I00SEOPpJT3jpM2w1qH0FpaVdG6shdyssyQ4Fw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_DVB_MMAP was misspelled either as CONFIG_DVB_MMSP or DVB_MMAP, so it had no effect at all. This fixes that, to make it possible to build it again. Fixes: 4021053ed52d ("media: dvb-core: make DVB mmap API optional") Signed-off-by: Arnd Bergmann --- drivers/media/dvb-core/Makefile | 2 +- drivers/media/dvb-core/dmxdev.c | 30 +++++++++++++++--------------- include/media/dvb_vb2.h | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) -- 2.9.0 diff --git a/drivers/media/dvb-core/Makefile b/drivers/media/dvb-core/Makefile index 3756ccf83384..045e2392c668 100644 --- a/drivers/media/dvb-core/Makefile +++ b/drivers/media/dvb-core/Makefile @@ -4,7 +4,7 @@ # dvb-net-$(CONFIG_DVB_NET) := dvb_net.o -dvb-vb2-$(CONFIG_DVB_MMSP) := dvb_vb2.o +dvb-vb2-$(CONFIG_DVB_MMAP) := dvb_vb2.o dvb-core-objs := dvbdev.o dmxdev.o dvb_demux.o \ dvb_ca_en50221.o dvb_frontend.o \ diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c index bc198f84b9cd..41e0259fc1c7 100644 --- a/drivers/media/dvb-core/dmxdev.c +++ b/drivers/media/dvb-core/dmxdev.c @@ -128,7 +128,7 @@ static int dvb_dvr_open(struct inode *inode, struct file *file) struct dvb_device *dvbdev = file->private_data; struct dmxdev *dmxdev = dvbdev->priv; struct dmx_frontend *front; -#ifndef DVB_MMAP +#ifndef CONFIG_DVB_MMAP bool need_ringbuffer = false; #else const bool need_ringbuffer = true; @@ -144,7 +144,7 @@ static int dvb_dvr_open(struct inode *inode, struct file *file) return -ENODEV; } -#ifndef DVB_MMAP +#ifndef CONFIG_DVB_MMAP if ((file->f_flags & O_ACCMODE) == O_RDONLY) need_ringbuffer = true; #else @@ -200,7 +200,7 @@ static int dvb_dvr_release(struct inode *inode, struct file *file) { struct dvb_device *dvbdev = file->private_data; struct dmxdev *dmxdev = dvbdev->priv; -#ifndef DVB_MMAP +#ifndef CONFIG_DVB_MMAP bool need_ringbuffer = false; #else const bool need_ringbuffer = true; @@ -213,7 +213,7 @@ static int dvb_dvr_release(struct inode *inode, struct file *file) dmxdev->demux->connect_frontend(dmxdev->demux, dmxdev->dvr_orig_fe); } -#ifndef DVB_MMAP +#ifndef CONFIG_DVB_MMAP if ((file->f_flags & O_ACCMODE) == O_RDONLY) need_ringbuffer = true; #endif @@ -426,7 +426,7 @@ static int dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len, { struct dmxdev_filter *dmxdevfilter = feed->priv; struct dvb_ringbuffer *buffer; -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP struct dvb_vb2_ctx *ctx; #endif int ret; @@ -440,12 +440,12 @@ static int dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len, if (dmxdevfilter->params.pes.output == DMX_OUT_TAP || dmxdevfilter->params.pes.output == DMX_OUT_TSDEMUX_TAP) { buffer = &dmxdevfilter->buffer; -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP ctx = &dmxdevfilter->vb2_ctx; #endif } else { buffer = &dmxdevfilter->dev->dvr_buffer; -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP ctx = &dmxdevfilter->dev->dvr_vb2_ctx; #endif } @@ -1111,7 +1111,7 @@ static int dvb_demux_do_ioctl(struct file *file, mutex_unlock(&dmxdevfilter->mutex); break; -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP case DMX_REQBUFS: if (mutex_lock_interruptible(&dmxdevfilter->mutex)) { mutex_unlock(&dmxdev->mutex); @@ -1199,7 +1199,7 @@ static __poll_t dvb_demux_poll(struct file *file, poll_table *wait) return mask; } -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP static int dvb_demux_mmap(struct file *file, struct vm_area_struct *vma) { struct dmxdev_filter *dmxdevfilter = file->private_data; @@ -1249,7 +1249,7 @@ static const struct file_operations dvb_demux_fops = { .release = dvb_demux_release, .poll = dvb_demux_poll, .llseek = default_llseek, -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP .mmap = dvb_demux_mmap, #endif }; @@ -1280,7 +1280,7 @@ static int dvb_dvr_do_ioctl(struct file *file, ret = dvb_dvr_set_buffer_size(dmxdev, arg); break; -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP case DMX_REQBUFS: ret = dvb_vb2_reqbufs(&dmxdev->dvr_vb2_ctx, parg); break; @@ -1322,7 +1322,7 @@ static __poll_t dvb_dvr_poll(struct file *file, poll_table *wait) struct dvb_device *dvbdev = file->private_data; struct dmxdev *dmxdev = dvbdev->priv; __poll_t mask = 0; -#ifndef DVB_MMAP +#ifndef CONFIG_DVB_MMAP bool need_ringbuffer = false; #else const bool need_ringbuffer = true; @@ -1337,7 +1337,7 @@ static __poll_t dvb_dvr_poll(struct file *file, poll_table *wait) poll_wait(file, &dmxdev->dvr_buffer.queue, wait); -#ifndef DVB_MMAP +#ifndef CONFIG_DVB_MMAP if ((file->f_flags & O_ACCMODE) == O_RDONLY) need_ringbuffer = true; #endif @@ -1353,7 +1353,7 @@ static __poll_t dvb_dvr_poll(struct file *file, poll_table *wait) return mask; } -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP static int dvb_dvr_mmap(struct file *file, struct vm_area_struct *vma) { struct dvb_device *dvbdev = file->private_data; @@ -1381,7 +1381,7 @@ static const struct file_operations dvb_dvr_fops = { .release = dvb_dvr_release, .poll = dvb_dvr_poll, .llseek = default_llseek, -#ifdef DVB_MMAP +#ifdef CONFIG_DVB_MMAP .mmap = dvb_dvr_mmap, #endif }; diff --git a/include/media/dvb_vb2.h b/include/media/dvb_vb2.h index 49b46e5bdcf0..f511b4d7760b 100644 --- a/include/media/dvb_vb2.h +++ b/include/media/dvb_vb2.h @@ -103,7 +103,7 @@ struct dvb_vb2_ctx { char name[DVB_VB2_NAME_MAX + 1]; }; -#ifndef DVB_MMAP +#ifndef CONFIG_DVB_MMAP static inline int dvb_vb2_init(struct dvb_vb2_ctx *ctx, const char *name, int non_blocking) {