From patchwork Fri Oct 16 20:30:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7420691 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 74315BEEA4 for ; Fri, 16 Oct 2015 20:31:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A07A920693 for ; Fri, 16 Oct 2015 20:31:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C47C120681 for ; Fri, 16 Oct 2015 20:31:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932182AbbJPUbN (ORCPT ); Fri, 16 Oct 2015 16:31:13 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:57425 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751904AbbJPUbN (ORCPT ); Fri, 16 Oct 2015 16:31:13 -0400 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue104) with ESMTPSA (Nemesis) id 0MRUgC-1Zy8y83i3M-00Shvr; Fri, 16 Oct 2015 22:31:04 +0200 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Kozlov Sergey , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] [media] horus3a: fix horus3a_attach inline wrapper Date: Fri, 16 Oct 2015 22:30:59 +0200 Message-ID: <7188906.Hi9qi0FZQC@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:RJCSEch5BNiZ5jiGKaqeldlZedYVMC71+TLdC4dDmAa9BLpxE7o nz11zWd0STKDc+bW+PtUOhkkmN3nSGx/eWfzitD429luGsWErtffYlkmZEBqRuv1c0qGFoy XYrRoTv9O/KSifn7/q1vAhArO1r56PhnY+F2G0AeL6LnIbiK2RPU5r8DGY54eSqMVpa13UJ BfD81BOBcToLk6ygxc0bA== X-UI-Out-Filterresults: notjunk:1; V01:K0:QKS41rdngIs=:l6KPorqP3HV9KJSFq3MOq6 U83grJGzezlSHlcxO7IGzmjTdLWncxCPT4Xxm+wNi24FRd9r+Ii6R7RZyfI6Hrf8tohjjT6ot ELNUf5kYxqqZJm3jiAInL8W3wscz5EU86r2AwXo2XwM6gxm+wu48y9LlsRGCG9PWItFTPFQLp K417FSHvYO2RiWmA6Ch1JgJKiKBmrOZJQiERWJcEoQrwZ0MIJ+r6fZVElXSS0seOtrMYoVvxT VlwjUyQ2Nk6HJ7yhY09EjHiGa/eDxvDHcfLgnnaIN77LQdIOfLqSdJrx9L+Y3A8LgSeuPLRwc x1j8GIMVYlLBIlC0Nac3TZf5+zVpDDtPonpxs+Y39x8tUupDjyT6wSfEz5FHI4WfdNFDiushR bWCSETjtI0XCvqqlJG9hcRkD1VfL/a7TdnVoXziWn3hcs459kqqBYd9+6yAg/Nn9Dbl2hS/5Y r2oM6ptKAcyDmJ03OQZI3Ugp8G4OE75WbmEQYdjaHrosqHvZP7rNaLUFXRU6DHaRz37fiOcdd r+kL9TNByjOYeQtsD4TyAJkZfuxe01Lb+qimfGSCpbCNFHZ6fhSQq7yWSUAPIbVo6R4v7BrkO XoL84tdHe6hZCGfMcdhpd6P/Y2PPmNJ+Tk5tgK/44HljUbW4XhbpMWrghX/OVXHlB3eZ+iR5z U77IZ8mtzQKEqwfCieshVThXSIRZvw9GpLNsQgy4SoXqFoMJt2EU3FpLrju5uwgLilL/AMmAI QpooCHy4qpqMsRGB 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, T_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 'static inline' version of horus3a_attach() is incorrectly copied from another file, which results in a build error when CONFIG_DVB_HORUS3A is disabled: In file included from /git/arm-soc/drivers/media/pci/netup_unidvb/netup_unidvb_core.c:34:0: media/dvb-frontends/horus3a.h:51:13: warning: 'struct cxd2820r_config' declared inside parameter list media/dvb-frontends/horus3a.h:51:13: warning: its scope is only this definition or declaration, which is probably not what you want media/pci/netup_unidvb/netup_unidvb_core.c: In function 'netup_unidvb_dvb_init': media/pci/netup_unidvb/netup_unidvb_core.c:417:279: warning: passing argument 1 of '__a' from incompatible pointer type [-Wincompatible-pointer-types] media/pci/netup_unidvb/netup_unidvb_core.c:417:279: note: expected 'const struct cxd2820r_config *' but argument is of type 'struct dvb_frontend *' media/pci/netup_unidvb/netup_unidvb_core.c:417:298: warning: passing argument 2 of '__a' from incompatible pointer type [-Wincompatible-pointer-types] media/pci/netup_unidvb/netup_unidvb_core.c:417:298: note: expected 'struct i2c_adapter *' but argument is of type 'struct horus3a_config *' media/pci/netup_unidvb/netup_unidvb_core.c:417:275: error: too many arguments to function '__a' This changes the code to have the correct prototype. Signed-off-by: Arnd Bergmann Fixes: a5d32b358254 ("[media] horus3a: Sony Horus3A DVB-S/S2 tuner driver") --- Found on ARM randconfig builds -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/dvb-frontends/horus3a.h b/drivers/media/dvb-frontends/horus3a.h index b055319d532e..c1e2d1834b78 100644 --- a/drivers/media/dvb-frontends/horus3a.h +++ b/drivers/media/dvb-frontends/horus3a.h @@ -46,8 +46,8 @@ extern struct dvb_frontend *horus3a_attach(struct dvb_frontend *fe, const struct horus3a_config *config, struct i2c_adapter *i2c); #else -static inline struct dvb_frontend *horus3a_attach( - const struct cxd2820r_config *config, +static inline struct dvb_frontend *horus3a_attach(struct dvb_frontend *fe, + const struct horus3a_config *config, struct i2c_adapter *i2c) { printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);