Commit d71dc239 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: get rid of isys_dma.h and isys_dma_local.h 



There aren't much on this abstraction. Just move the defines
to isys_dma_private.h and isys_dma_public.h, cleaning up
the includes.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 641c2292

drivers/staging/media/atomisp/pci/css_2401_system/host/isys_dma.c

+2 −8
Original line number Diff line number Diff line
@@ -13,16 +13,10 @@ 
 * more details.

 */



#include "isys_dma.h"

#include "system_local.h"

#include "isys_dma_global.h"

#include "assert_support.h"



#ifndef __INLINE_ISYS2401_DMA__

/*

 * Include definitions for isys dma register access functions. isys_dma.h

 * includes declarations of these functions by including isys_dma_public.h.

 */

#include "isys_dma_private.h"

#endif



const isys2401_dma_channel N_ISYS2401_DMA_CHANNEL_PROCS[N_ISYS2401_DMA_ID] = {

	N_ISYS2401_DMA_CHANNEL

drivers/staging/media/atomisp/pci/css_2401_system/host/isys_dma_local.h

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Support for Intel Camera Imaging ISP subsystem.

 * Copyright (c) 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 __ISYS_DMA_LOCAL_H_INCLUDED__

#define __ISYS_DMA_LOCAL_H_INCLUDED__



#include "isys_dma_global.h"



#endif /* __ISYS_DMA_LOCAL_H_INCLUDED__ */

drivers/staging/media/atomisp/pci/css_2401_system/host/isys_dma_private.h

+5 −7
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ 
#include "dma_v2_defs.h"

#include "print_support.h"



STORAGE_CLASS_ISYS2401_DMA_C void isys2401_dma_reg_store(

    const isys2401_dma_ID_t	dma_id,

void isys2401_dma_reg_store(const isys2401_dma_ID_t	dma_id,

			    const unsigned int		reg,

			    const hrt_data		value)

{
@@ -40,8 +39,7 @@ STORAGE_CLASS_ISYS2401_DMA_C void isys2401_dma_reg_store( 
	ia_css_device_store_uint32(reg_loc, value);

}



STORAGE_CLASS_ISYS2401_DMA_C hrt_data isys2401_dma_reg_load(

    const isys2401_dma_ID_t	dma_id,

hrt_data isys2401_dma_reg_load(const isys2401_dma_ID_t	dma_id,

			       const unsigned int	reg)

{

	unsigned int reg_loc;

drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_dma_public.h

+2 −2
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ 
#include "system_local.h"

#include "type_support.h"



STORAGE_CLASS_ISYS2401_DMA_H void isys2401_dma_reg_store(

extern void isys2401_dma_reg_store(

    const isys2401_dma_ID_t dma_id,

    const unsigned int	reg,

    const hrt_data		value);



STORAGE_CLASS_ISYS2401_DMA_H hrt_data isys2401_dma_reg_load(

extern hrt_data isys2401_dma_reg_load(

    const isys2401_dma_ID_t dma_id,

    const unsigned int	reg);

drivers/staging/media/atomisp/pci/hive_isp_css_include/isys_dma.h

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Support for Intel Camera Imaging ISP subsystem.

 * Copyright (c) 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 __ISYS_DMA_H_INCLUDED__

#define __ISYS_DMA_H_INCLUDED__



/*

 * This file is included on every cell {SP,ISP,host} and on every system

 * that uses the input system device(s). It defines the API to DLI bridge

 *

 * System and cell specific interfaces and inline code are included

 * conditionally through Makefile path settings.

 *

 * - system and cell agnostic interfaces, constants and identifiers

 * - public:  system agnostic, cell specific interfaces

 * - private: system dependent, cell specific interfaces &

 *   inline implementations

 * - global:  system specific constants and identifiers

 * - local:   system and cell specific constants and identifiers

 */



#include "system_local.h"

#include "isys_dma_local.h"



#ifndef __INLINE_ISYS2401_DMA__

#define STORAGE_CLASS_ISYS2401_DMA_H extern

#define STORAGE_CLASS_ISYS2401_DMA_C

#include "isys_dma_public.h"

#else  /* __INLINE_ISYS2401_DMA__ */

#define STORAGE_CLASS_ISYS2401_DMA_H static inline

#define STORAGE_CLASS_ISYS2401_DMA_C static inline

#include "isys_dma_private.h"

#endif /* __INLINE_ISYS2401_DMA__ */



#endif /* __ISYS_DMA_H_INCLUDED__ */