p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

media: staging: atomisp: don't declare the same vars as both private and public 

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 <mchehab@s-opensource.com>
This commit is contained in:
Mauro Carvalho Chehab 2018-04-06 13:47:20 -04:00
parent 2721058509
commit 3204043fcf
4 changed files with 18 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu.c
View File

@ -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)

44
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h
View File

@ -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__ */

22
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/mmu_public.h
View File

@ -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__ */

8
drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/mmu_device.h
View File

@ -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__ */