From patchwork Thu Nov 29 09:12:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 1820901 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id ACA2ADF230 for ; Thu, 29 Nov 2012 09:12:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751369Ab2K2JMj (ORCPT ); Thu, 29 Nov 2012 04:12:39 -0500 Received: from moutng.kundenserver.de ([212.227.17.10]:59978 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751155Ab2K2JMh (ORCPT ); Thu, 29 Nov 2012 04:12:37 -0500 Received: from axis700.grange (dslb-178-006-249-221.pools.arcor-ip.net [178.6.249.221]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0LqWEj-1T0HhG1paL-00dtXq; Thu, 29 Nov 2012 10:12:31 +0100 Received: by axis700.grange (Postfix, from userid 1000) id DCA9240B99; Thu, 29 Nov 2012 10:12:30 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id D3C8A40B98; Thu, 29 Nov 2012 10:12:30 +0100 (CET) Date: Thu, 29 Nov 2012 10:12:30 +0100 (CET) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Linux Media Mailing List cc: Pawel Osciak Subject: [PATCH] media: mem2mem: make reference to struct m2m_ops in the core const Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:Aj2ncdI0vlegLlO0EO8FFOOqDmkfTFpT40pgttiogvu E0AQ5nm3ui5aSd9rPxoLS53fPh58TtQqbbCZnB+OQ+xAWwnS8y 3goSjgq0qCvxS4M6yFsKWStg7nNp4Y+9U7r0lUueh5/FZFljYZ ezx6gN+qZXUm5ZBQILsDoP+sOQSs3X7n9UPBbSYZBaXLRWl9H3 YtmeJvGmzrYUDXYEGIocAUPU8PsQu/TXVTL6F9/EGOJTKoqpA/ lzfkLTVYa7IeAsYX9SsEcQw+yiWkRBYKXp/XETiN7b3aBmHJ1B FavXVUYbOYBuaiwlhnhZxiPCvpNWfPp1Uttmj67a5JporkFB2U u1kgVeRVuNEsBRvBMHsSKCSwmjiFpim+DO2Vk5ZxRS+QnJU+b6 b6D0ZXaPsavFQ== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The mem2mem core doesn't change struct m2m_ops, provided by the driver, make references to it const. Signed-off-by: Guennadi Liakhovetski --- drivers/media/v4l2-core/v4l2-mem2mem.c | 4 ++-- include/media/v4l2-mem2mem.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c index 3ac8358..e4ff65d 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -62,7 +62,7 @@ struct v4l2_m2m_dev { struct list_head job_queue; spinlock_t job_spinlock; - struct v4l2_m2m_ops *m2m_ops; + const struct v4l2_m2m_ops *m2m_ops; }; static struct v4l2_m2m_queue_ctx *get_queue_ctx(struct v4l2_m2m_ctx *m2m_ctx, @@ -506,7 +506,7 @@ EXPORT_SYMBOL(v4l2_m2m_mmap); * * Usually called from driver's probe() function. */ -struct v4l2_m2m_dev *v4l2_m2m_init(struct v4l2_m2m_ops *m2m_ops) +struct v4l2_m2m_dev *v4l2_m2m_init(const struct v4l2_m2m_ops *m2m_ops) { struct v4l2_m2m_dev *m2m_dev; diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h index 131cc4a..bec13da 100644 --- a/include/media/v4l2-mem2mem.h +++ b/include/media/v4l2-mem2mem.h @@ -122,7 +122,7 @@ unsigned int v4l2_m2m_poll(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, int v4l2_m2m_mmap(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, struct vm_area_struct *vma); -struct v4l2_m2m_dev *v4l2_m2m_init(struct v4l2_m2m_ops *m2m_ops); +struct v4l2_m2m_dev *v4l2_m2m_init(const struct v4l2_m2m_ops *m2m_ops); void v4l2_m2m_release(struct v4l2_m2m_dev *m2m_dev); struct v4l2_m2m_ctx *v4l2_m2m_ctx_init(struct v4l2_m2m_dev *m2m_dev,