From patchwork Mon Apr 16 10:22:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 10342595 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2FA8A60216 for ; Mon, 16 Apr 2018 10:22:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E2B420121 for ; Mon, 16 Apr 2018 10:22:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12B5D20499; Mon, 16 Apr 2018 10:22:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 626D720121 for ; Mon, 16 Apr 2018 10:22:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753094AbeDPKWi (ORCPT ); Mon, 16 Apr 2018 06:22:38 -0400 Received: from osg.samsung.com ([64.30.133.232]:57948 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751086AbeDPKWi (ORCPT ); Mon, 16 Apr 2018 06:22:38 -0400 Received: from localhost (localhost [127.0.0.1]) by osg.samsung.com (Postfix) with ESMTP id C079424C47; Mon, 16 Apr 2018 03:22:37 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at dev.s-opensource.com Received: from osg.samsung.com ([127.0.0.1]) by localhost (localhost [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bqJdVORfrdOa; Mon, 16 Apr 2018 03:22:36 -0700 (PDT) Received: from smtp.s-opensource.com (unknown [201.86.164.1]) by osg.samsung.com (Postfix) with ESMTPSA id 6B9E324C3E; Mon, 16 Apr 2018 03:22:36 -0700 (PDT) Received: from mchehab by smtp.s-opensource.com with local (Exim 4.90_1) (envelope-from ) id 1f81HN-0002Qw-NL; Mon, 16 Apr 2018 06:22:33 -0400 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Linux Media Mailing List , Mauro Carvalho Chehab , Alan Cox , Sakari Ailus , Greg Kroah-Hartman , devel@driverdev.osuosl.org Subject: [PATCHv2 02/17] media: staging: atomisp: don't declare the same vars as both private and public Date: Mon, 16 Apr 2018 06:22:23 -0400 Message-Id: X-Mailer: git-send-email 2.14.3 In-Reply-To: <201804140516.7MYsvZU3%fengguang.wu@intel.com> References: <201804140516.7MYsvZU3%fengguang.wu@intel.com> To: unlisted-recipients:; (no To-header on input) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The mmu_private.h header is included at mmu.c, with duplicates the already existing definitions at mmu_public.h. Fix this by removing the erroneous header file. Solve those issues: drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h:24:26: warning: function 'mmu_reg_store' with external linkage has definition drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h:35:30: warning: function 'mmu_reg_load' with external linkage has definition drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h:24:26: warning: function 'mmu_reg_store' with external linkage has definition drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h:35:30: warning: function 'mmu_reg_load' with external linkage has definition Signed-off-by: Mauro Carvalho Chehab --- v2: re-added two function definitions that were at the mmu_private.h .../css2400/hive_isp_css_common/host/mmu.c | 4 -- .../css2400/hive_isp_css_common/host/mmu_private.h | 44 ---------------------- .../css2400/hive_isp_css_include/host/mmu_public.h | 22 +++++++++-- .../css2400/hive_isp_css_include/mmu_device.h | 8 ---- 4 files changed, 18 insertions(+), 60 deletions(-) delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu.c index a28b67eb66ea..1a1719d3e745 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu.c @@ -15,10 +15,6 @@ /* The name "mmu.h is already taken" */ #include "mmu_device.h" -#ifndef __INLINE_MMU__ -#include "mmu_private.h" -#endif /* __INLINE_MMU__ */ - void mmu_set_page_table_base_index( const mmu_ID_t ID, const hrt_data base_index) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h deleted file mode 100644 index 7377666f6eb7..000000000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2010-2015, Intel Corporation. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - */ - -#ifndef __MMU_PRIVATE_H_INCLUDED__ -#define __MMU_PRIVATE_H_INCLUDED__ - -#include "mmu_public.h" - -#include "device_access.h" - -#include "assert_support.h" - -STORAGE_CLASS_MMU_H void mmu_reg_store( - const mmu_ID_t ID, - const unsigned int reg, - const hrt_data value) -{ - assert(ID < N_MMU_ID); - assert(MMU_BASE[ID] != (hrt_address)-1); - ia_css_device_store_uint32(MMU_BASE[ID] + reg*sizeof(hrt_data), value); - return; -} - -STORAGE_CLASS_MMU_H hrt_data mmu_reg_load( - const mmu_ID_t ID, - const unsigned int reg) -{ - assert(ID < N_MMU_ID); - assert(MMU_BASE[ID] != (hrt_address)-1); - return ia_css_device_load_uint32(MMU_BASE[ID] + reg*sizeof(hrt_data)); -} - -#endif /* __MMU_PRIVATE_H_INCLUDED__ */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/mmu_public.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/mmu_public.h index 0a13eda73607..bbff4128603b 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/mmu_public.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/mmu_public.h @@ -16,6 +16,8 @@ #define __MMU_PUBLIC_H_INCLUDED__ #include "system_types.h" +#include "device_access.h" +#include "assert_support.h" /*! Set the page table base index of MMU[ID] @@ -62,10 +64,17 @@ extern void mmu_invalidate_cache_all(void); \return none, MMU[ID].ctrl[reg] = value */ -STORAGE_CLASS_MMU_H void mmu_reg_store( +static inline void mmu_reg_store( const mmu_ID_t ID, const unsigned int reg, - const hrt_data value); + const hrt_data value) +{ + assert(ID < N_MMU_ID); + assert(MMU_BASE[ID] != (hrt_address)-1); + ia_css_device_store_uint32(MMU_BASE[ID] + reg*sizeof(hrt_data), value); + return; +} + /*! Read from a control register of MMU[ID] @@ -75,8 +84,13 @@ STORAGE_CLASS_MMU_H void mmu_reg_store( \return MMU[ID].ctrl[reg] */ -STORAGE_CLASS_MMU_H hrt_data mmu_reg_load( +static inline hrt_data mmu_reg_load( const mmu_ID_t ID, - const unsigned int reg); + const unsigned int reg) +{ + assert(ID < N_MMU_ID); + assert(MMU_BASE[ID] != (hrt_address)-1); + return ia_css_device_load_uint32(MMU_BASE[ID] + reg*sizeof(hrt_data)); +} #endif /* __MMU_PUBLIC_H_INCLUDED__ */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/mmu_device.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/mmu_device.h index 519e850ec390..8f6f1dc40095 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/mmu_device.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/mmu_device.h @@ -35,14 +35,6 @@ #include "system_local.h" #include "mmu_local.h" -#ifndef __INLINE_MMU__ -#define STORAGE_CLASS_MMU_H extern -#define STORAGE_CLASS_MMU_C #include "mmu_public.h" -#else /* __INLINE_MMU__ */ -#define STORAGE_CLASS_MMU_H static inline -#define STORAGE_CLASS_MMU_C static inline -#include "mmu_private.h" -#endif /* __INLINE_MMU__ */ #endif /* __MMU_DEVICE_H_INCLUDED__ */