mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-01 04:53:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

media: atomisp: Included both input system headers

Browse Source 
Included necessary input system header files (local, private, public
scopes) for both types of atomisp. There is also a conflict of
declaration issue so the unused input_system_state_s is removed.

Link: https://lore.kernel.org/r/20230713100231.308923-4-hpa@redhat.com

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Kate Hsuan
2023-07-13 12:02:23 +02:00
committed by Mauro Carvalho Chehab
parent 8fc67b18fa
commit 2aea82b03c
8 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/media/atomisp/pci/input_system_local.h
View File

@@ -138,8 +138,5 @@ struct rx_cfg_s {
bool is_two_ppc;
};
#ifdef ISP2401
# include "isp2401_input_system_local.h"
#else
# include "isp2400_input_system_local.h"
#endif
#include "isp2401_input_system_local.h"
#include "isp2400_input_system_local.h"

7
drivers/staging/media/atomisp/pci/input_system_private.h
View File

@@ -4,8 +4,5 @@
* (c) 2020 Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
*/
#ifdef ISP2401
# include "isp2401_input_system_private.h"
#else
# include "isp2400_input_system_private.h"
#endif
#include "isp2401_input_system_private.h"
#include "isp2400_input_system_private.h"

4
drivers/staging/media/atomisp/pci/input_system_public.h
View File

@@ -4,6 +4,4 @@
* (c) 2020 Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
*/
#ifndef ISP2401
# include "isp2400_input_system_public.h"
#endif
#include "isp2400_input_system_public.h"

4
drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
View File

@@ -13,8 +13,8 @@
* more details.
*/
#ifndef __INPUT_SYSTEM_LOCAL_H_INCLUDED__
#define __INPUT_SYSTEM_LOCAL_H_INCLUDED__
#ifndef __INPUT_SYSTEM_2400_LOCAL_H_INCLUDED__
#define __INPUT_SYSTEM_2400_LOCAL_H_INCLUDED__
#include "input_system_defs.h" /* HIVE_ISYS_GPREG_MULTICAST_A_IDX,... */

4
drivers/staging/media/atomisp/pci/isp2400_input_system_private.h
View File

@@ -13,8 +13,8 @@
* more details.
*/
#ifndef __INPUT_SYSTEM_PRIVATE_H_INCLUDED__
#define __INPUT_SYSTEM_PRIVATE_H_INCLUDED__
#ifndef __INPUT_SYSTEM_2400_PRIVATE_H_INCLUDED__
#define __INPUT_SYSTEM_2400_PRIVATE_H_INCLUDED__
#include "input_system_public.h"

7
drivers/staging/media/atomisp/pci/isp2400_input_system_public.h
View File

@@ -13,13 +13,11 @@
* more details.
*/
#ifndef __INPUT_SYSTEM_PUBLIC_H_INCLUDED__
#define __INPUT_SYSTEM_PUBLIC_H_INCLUDED__
#ifndef __INPUT_SYSTEM_2400_PUBLIC_H_INCLUDED__
#define __INPUT_SYSTEM_2400_PUBLIC_H_INCLUDED__
#include <type_support.h>
#ifdef ISP2401
#include "isys_public.h"
#else
typedef struct receiver_state_s receiver_state_t;
@@ -359,6 +357,5 @@ input_system_err_t input_system_gpfifo_channel_cfg(
u32 nof_frames,
target_cfg2400_t target
);
#endif /* #ifdef ISP2401 */
#endif /* __INPUT_SYSTEM_PUBLIC_H_INCLUDED__ */

4
drivers/staging/media/atomisp/pci/isp2401_input_system_local.h
View File

@@ -13,8 +13,8 @@
* more details.
*/
#ifndef __INPUT_SYSTEM_LOCAL_H_INCLUDED__
#define __INPUT_SYSTEM_LOCAL_H_INCLUDED__
#ifndef __INPUT_SYSTEM_2401_LOCAL_H_INCLUDED__
#define __INPUT_SYSTEM_2401_LOCAL_H_INCLUDED__
#include "csi_rx.h"
#include "pixelgen.h"

4
drivers/staging/media/atomisp/pci/isp2401_input_system_private.h
View File

@@ -13,8 +13,8 @@
* more details.
*/
#ifndef __INPUT_SYSTEM_PRIVATE_H_INCLUDED__
#define __INPUT_SYSTEM_PRIVATE_H_INCLUDED__
#ifndef __INPUT_SYSTEM_2401_PRIVATE_H_INCLUDED__
#define __INPUT_SYSTEM_2401_PRIVATE_H_INCLUDED__
#include "input_system_public.h"