diff options
| author | Mauro Carvalho Chehab | 2018-03-26 22:08:34 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2018-04-04 13:36:29 +0200 |
| commit | fd418c8a598511865d8b2774bce58bb4b1f5d962 (patch) | |
| tree | 9808dc7bf8b4f5611ba23110dc1104e7eb056f27 /drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_input_port.h | |
| parent | media: staging: atomisp: get rid of some static warnings (diff) | |
| download | kernel-qcow2-linux-fd418c8a598511865d8b2774bce58bb4b1f5d962.tar.gz kernel-qcow2-linux-fd418c8a598511865d8b2774bce58bb4b1f5d962.tar.xz kernel-qcow2-linux-fd418c8a598511865d8b2774bce58bb4b1f5d962.zip | |
media: staging: atomisp: stop mixing enum types
This driver abuses on enum types:
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1027:37: warning: mixing different enum types
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1027:37: int enum ia_css_csi2_port versus
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1027:37: int enum mipi_port_ID_t
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1037:39: warning: mixing different enum types
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1037:39: int enum ia_css_csi2_port versus
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:1037:39: int enum mipi_port_ID_t
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:2147:62: warning: mixing different enum types
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:2147:62: int enum mipi_port_ID_t versus
drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c:2147:62: int enum ia_css_csi2_port
Doing some "implicit" typecast. Fix it by using just one enum
everywhere, and stopping using typedef to refer to it.
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_input_port.h')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_input_port.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_input_port.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_input_port.h index f415570a3da9..ad9ca5449369 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_input_port.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_input_port.h @@ -12,6 +12,9 @@ * more details. */ +/* For MIPI_PORT0_ID to MIPI_PORT2_ID */ +#include "system_global.h" + #ifndef __IA_CSS_INPUT_PORT_H #define __IA_CSS_INPUT_PORT_H @@ -19,21 +22,12 @@ * This file contains information about the possible input ports for CSS */ -/* Enumeration of the physical input ports on the CSS hardware. - * There are 3 MIPI CSI-2 ports. - */ -enum ia_css_csi2_port { - IA_CSS_CSI2_PORT0, /* Implicitly map to MIPI_PORT0_ID */ - IA_CSS_CSI2_PORT1, /* Implicitly map to MIPI_PORT1_ID */ - IA_CSS_CSI2_PORT2 /* Implicitly map to MIPI_PORT2_ID */ -}; - /* Backward compatible for CSS API 2.0 only * TO BE REMOVED when all drivers move to CSS API 2.1 */ -#define IA_CSS_CSI2_PORT_4LANE IA_CSS_CSI2_PORT0 -#define IA_CSS_CSI2_PORT_1LANE IA_CSS_CSI2_PORT1 -#define IA_CSS_CSI2_PORT_2LANE IA_CSS_CSI2_PORT2 +#define IA_CSS_CSI2_PORT_4LANE MIPI_PORT0_ID +#define IA_CSS_CSI2_PORT_1LANE MIPI_PORT1_ID +#define IA_CSS_CSI2_PORT_2LANE MIPI_PORT2_ID /* The CSI2 interface supports 2 types of compression or can * be run without compression. @@ -56,7 +50,7 @@ struct ia_css_csi2_compression { /* Input port structure. */ struct ia_css_input_port { - enum ia_css_csi2_port port; /** Physical CSI-2 port */ + enum mipi_port_id port; /** Physical CSI-2 port */ unsigned int num_lanes; /** Number of lanes used (4-lane port only) */ unsigned int timeout; /** Timeout value */ unsigned int rxcount; /** Register value, should include all lanes */ |