From patchwork Fri Mar 4 10:13:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8501721 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CD29F9F659 for ; Fri, 4 Mar 2016 10:13:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EFDB8201F4 for ; Fri, 4 Mar 2016 10:13:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1993A201CE for ; Fri, 4 Mar 2016 10:13:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752575AbcCDKNw (ORCPT ); Fri, 4 Mar 2016 05:13:52 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:53646 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752112AbcCDKNv (ORCPT ); Fri, 4 Mar 2016 05:13:51 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue004) with ESMTPA (Nemesis) id 0LiGhD-1a7Pfg1GAF-00nOTk; Fri, 04 Mar 2016 11:13:43 +0100 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Arnd Bergmann , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] v4l2-mc.h: fix PM/pipeline stub definitions Date: Fri, 4 Mar 2016 11:13:36 +0100 Message-Id: <1457086419-261550-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:y9CYHLZNwF5+3Gba8V13+EB5A38Q0jLiIMp2r7zfKUBBm2olnEd Ms9Y1rCKeKMgiPCqR+pyT7OXeceoIxZICBn6Ba6vJ4ca/dJyRMxQa6gUVSgqNSurjKxlECh VrLUHeVb2/At8F7CNcjgxsnEjpu1gLHuasuh1bY6pCVysr5r44xMPBy+o2RIHNAI3N2CFtJ zj4QfKLuCCHsEbuCTDegw== X-UI-Out-Filterresults: notjunk:1; V01:K0:+OMYbh+kLro=:xMHfbvQOuW4je8idY7xlfY /uhdXsXkdp21Bw6Pc10TkJeAfVqRGG662TwkRk1Yi5V4ZcTV7Pfh82BB8vEena0WupEJwwnn8 wfnv8zqYfyIJF9IJF6hiBQ4SNAOLh/OyqYF+MTAlGRmvkB95/Qqgd8C1Q5u1p804TIy2c9Cix ovEE0Ifzf6QZJCdQFApR2fem1uIFdE3md+p1bd/Wg2CwUhVTCVNUXIZK1N62edcSI8HVHUUsz d9pVtgliUtWqNyTtW8rxi1XKcr/LD6ytex/RfiuK9xkO08Kv4aNo4FrCgvoWbjW0sfm2PtFyg 90azQdzn6pT8PkkTsl/Hc11ADPuq8KxFCFQoDtupKhoYgBzrg5ZDLf5hbqKadgOjWY4CpVVG8 n6Pt6GhJGd7lJwjocrVD0a3qZHJd9ej60nQ8NNP/+c3sZdFO25Is4nlYNdAvFAZqAwdR4uWqn Mt/v5z+gAdB3t4S+4btnKUu7KIklUr/amsjpGQ4JkqDz53YEJthgxrnmO26FcscLEmMs2+aJK v3kNvu7IaggOEIajqtP8YV8NIBLWcuohQ1ABRLt0bTMpck7yoBcQGmgIP6FciKOlyROUh3HQN 5JitoaKqbxOOddDgTCvsUBMmyjQDXppM1ubnpypmaSLcquqNyGCvN50ENNPyxrZM1oFZXECM0 AqCKWstD8/NdYScXcdkSt31amM4239bZZNJDo8YFYAQPSh8V8H0gJBsONbfKmsC4eun0= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The newly added functions have an extra semicolon, which prevents compilation, and they need to be marked inline: In file included from ../include/media/tuner.h:23:0, from ../drivers/media/tuners/tuner-simple.c:10: ../include/media/v4l2-mc.h:233:1: error: expected identifier or '(' before '{' token Signed-off-by: Arnd Bergmann Fixes: a77bf7048add ("v4l2-mc.h: Add stubs for the V4L2 PM/pipeline routines") --- include/media/v4l2-mc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/media/v4l2-mc.h b/include/media/v4l2-mc.h index 96cfca9cd338..6096e635fc9f 100644 --- a/include/media/v4l2-mc.h +++ b/include/media/v4l2-mc.h @@ -229,13 +229,13 @@ static inline int v4l_vb2q_enable_media_source(struct vb2_queue *q) return 0; } -int v4l2_pipeline_pm_use(struct media_entity *entity, int use); +static inline int v4l2_pipeline_pm_use(struct media_entity *entity, int use) { return 0; } -int v4l2_pipeline_link_notify(struct media_link *link, u32 flags, - unsigned int notification); +static inline int v4l2_pipeline_link_notify(struct media_link *link, u32 flags, + unsigned int notification) { return 0; }