lkml.org 
[lkml]   [2020]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 7/9] staging: media: atomisp: fix enum type mixups
    On Fri, May 29, 2020 at 10:00:29PM +0200, Arnd Bergmann wrote:
    > Some function calls pass an incorrect enum type:
    >
    > drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c:858:16: error: implicit conversion from enumeration type 'input_system_ID_t' to different enumeration type 'gp_device_ID_t' [-Werror,-Wenum-conversion]
    > gp_device_rst(INPUT_SYSTEM0_ID);
    > ~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~
    > drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c:860:19: error: implicit conversion from enumeration type 'input_system_ID_t' to different enumeration type 'gp_device_ID_t' [-Werror,-Wenum-conversion]
    > input_switch_rst(INPUT_SYSTEM0_ID);
    > ~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~
    > drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c:876:27: error: implicit conversion from enumeration type 'input_system_cfg_flag_t' to different enumeration type 'input_system_connection_t' [-Werror,-Wenum-conversion]
    > config.multicast[i] = INPUT_SYSTEM_CFG_FLAG_RESET;
    > ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~
    > drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c:1326:32: error: implicit conversion from enumeration type 'input_system_ID_t' to different enumeration type 'gp_device_ID_t' [-Werror,-Wenum-conversion]
    > input_selector_cfg_for_sensor(INPUT_SYSTEM0_ID);
    > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~
    > drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c:1329:19: error: implicit conversion from enumeration type 'input_system_ID_t' to different enumeration type 'gp_device_ID_t' [-Werror,-Wenum-conversion]
    > input_switch_cfg(INPUT_SYSTEM0_ID, &config.input_switch_cfg);
    > ~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~
    >
    > INPUT_SYSTEM0_ID is zero, so use the corresponding zero-value
    > of the expected types instead.
    >
    > Fixes: a49d25364dfb ("staging/atomisp: Add support for the Intel IPU v2")
    > Signed-off-by: Arnd Bergmann <arnd@arndb.de>

    Huh weird that I did not see this warning but you do randconfigs so
    that's expected.

    Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>

    > ---
    > .../pci/hive_isp_css_common/host/input_system.c | 10 +++++-----
    > 1 file changed, 5 insertions(+), 5 deletions(-)
    >
    > diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c
    > index 2114cf4f3fda..aa0f0fca9346 100644
    > --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c
    > +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c
    > @@ -855,9 +855,9 @@ input_system_error_t input_system_configuration_reset(void)
    >
    > input_system_network_rst(INPUT_SYSTEM0_ID);
    >
    > - gp_device_rst(INPUT_SYSTEM0_ID);
    > + gp_device_rst(GP_DEVICE0_ID);
    >
    > - input_switch_rst(INPUT_SYSTEM0_ID);
    > + input_switch_rst(GP_DEVICE0_ID);
    >
    > //target_rst();
    >
    > @@ -873,7 +873,7 @@ input_system_error_t input_system_configuration_reset(void)
    >
    > for (i = 0; i < N_CSI_PORTS; i++) {
    > config.csi_buffer_flags[i] = INPUT_SYSTEM_CFG_FLAG_RESET;
    > - config.multicast[i] = INPUT_SYSTEM_CFG_FLAG_RESET;
    > + config.multicast[i] = INPUT_SYSTEM_DISCARD_ALL;
    > }
    >
    > config.source_type_flags = INPUT_SYSTEM_CFG_FLAG_RESET;
    > @@ -1323,10 +1323,10 @@ static input_system_error_t configuration_to_registers(void)
    > } // end of switch (source_type)
    >
    > // Set input selector.
    > - input_selector_cfg_for_sensor(INPUT_SYSTEM0_ID);
    > + input_selector_cfg_for_sensor(GP_DEVICE0_ID);
    >
    > // Set input switch.
    > - input_switch_cfg(INPUT_SYSTEM0_ID, &config.input_switch_cfg);
    > + input_switch_cfg(GP_DEVICE0_ID, &config.input_switch_cfg);
    >
    > // Set input formatters.
    > // AM: IF are set dynamically.
    > --
    > 2.26.2
    >

    \
     
     \ /
      Last update: 2020-05-30 05:01    [W:4.259 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site