lkml.org 
[lkml]   [2023]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 10/17] media: qcom: camss: Untangle if/else spaghetti in camss
    Date
    We have a very convoluted if/else legacy here which needs to be
    rationalised to make it more sustainable.

    Adding in another Soc or two will make some of these if statements into
    increasingly large multi-clause behemoths.

    Introduce switches in the obvious places to despaghetiify.

    Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
    Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org>
    ---
    .../media/platform/qcom/camss/camss-csiphy.c | 16 +++++----
    drivers/media/platform/qcom/camss/camss-vfe.c | 33 +++++++++++--------
    .../media/platform/qcom/camss/camss-video.c | 17 +++++-----
    3 files changed, 37 insertions(+), 29 deletions(-)

    diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c
    index 4310a132dcbe2..18f9a4defb2a4 100644
    --- a/drivers/media/platform/qcom/camss/camss-csiphy.c
    +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c
    @@ -558,19 +558,21 @@ int msm_csiphy_subdev_init(struct camss *camss,
    csiphy->cfg.combo_mode = 0;
    csiphy->ops = res->ops;

    - if (camss->res->version == CAMSS_8x16) {
    + switch (camss->res->version) {
    + case CAMSS_8x16:
    csiphy->formats = csiphy_formats_8x16;
    csiphy->nformats = ARRAY_SIZE(csiphy_formats_8x16);
    - } else if (camss->res->version == CAMSS_8x96 ||
    - camss->res->version == CAMSS_660) {
    + break;
    + case CAMSS_8x96:
    + case CAMSS_660:
    csiphy->formats = csiphy_formats_8x96;
    csiphy->nformats = ARRAY_SIZE(csiphy_formats_8x96);
    - } else if (camss->res->version == CAMSS_845 ||
    - camss->res->version == CAMSS_8250) {
    + break;
    + case CAMSS_845:
    + case CAMSS_8250:
    csiphy->formats = csiphy_formats_sdm845;
    csiphy->nformats = ARRAY_SIZE(csiphy_formats_sdm845);
    - } else {
    - return -EINVAL;
    + break;
    }

    /* Memory */
    diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
    index 4d5c32d3dddbf..db8f68819ded9 100644
    --- a/drivers/media/platform/qcom/camss/camss-vfe.c
    +++ b/drivers/media/platform/qcom/camss/camss-vfe.c
    @@ -170,7 +170,8 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
    {
    struct vfe_device *vfe = to_vfe(line);

    - if (vfe->camss->res->version == CAMSS_8x16)
    + switch (vfe->camss->res->version) {
    + case CAMSS_8x16:
    switch (sink_code) {
    case MEDIA_BUS_FMT_YUYV8_1X16:
    {
    @@ -218,10 +219,11 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,

    return sink_code;
    }
    - else if (vfe->camss->res->version == CAMSS_8x96 ||
    - vfe->camss->res->version == CAMSS_660 ||
    - vfe->camss->res->version == CAMSS_845 ||
    - vfe->camss->res->version == CAMSS_8250)
    + break;
    + case CAMSS_8x96:
    + case CAMSS_660:
    + case CAMSS_845:
    + case CAMSS_8250:
    switch (sink_code) {
    case MEDIA_BUS_FMT_YUYV8_1X16:
    {
    @@ -281,8 +283,9 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,

    return sink_code;
    }
    - else
    - return 0;
    + break;
    + }
    + return 0;
    }

    int vfe_reset(struct vfe_device *vfe)
    @@ -1379,7 +1382,8 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
    init_completion(&l->output.sof);
    init_completion(&l->output.reg_update);

    - if (camss->res->version == CAMSS_8x16) {
    + switch (camss->res->version) {
    + case CAMSS_8x16:
    if (i == VFE_LINE_PIX) {
    l->formats = formats_pix_8x16;
    l->nformats = ARRAY_SIZE(formats_pix_8x16);
    @@ -1387,8 +1391,9 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
    l->formats = formats_rdi_8x16;
    l->nformats = ARRAY_SIZE(formats_rdi_8x16);
    }
    - } else if (camss->res->version == CAMSS_8x96 ||
    - camss->res->version == CAMSS_660) {
    + break;
    + case CAMSS_8x96:
    + case CAMSS_660:
    if (i == VFE_LINE_PIX) {
    l->formats = formats_pix_8x96;
    l->nformats = ARRAY_SIZE(formats_pix_8x96);
    @@ -1396,12 +1401,12 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
    l->formats = formats_rdi_8x96;
    l->nformats = ARRAY_SIZE(formats_rdi_8x96);
    }
    - } else if (camss->res->version == CAMSS_845 ||
    - camss->res->version == CAMSS_8250) {
    + break;
    + case CAMSS_845:
    + case CAMSS_8250:
    l->formats = formats_rdi_845;
    l->nformats = ARRAY_SIZE(formats_rdi_845);
    - } else {
    - return -EINVAL;
    + break;
    }
    }

    diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c
    index 46a89b5f6c171..a89da5ef47109 100644
    --- a/drivers/media/platform/qcom/camss/camss-video.c
    +++ b/drivers/media/platform/qcom/camss/camss-video.c
    @@ -1006,7 +1006,8 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev,

    mutex_init(&video->lock);

    - if (video->camss->res->version == CAMSS_8x16) {
    + switch (video->camss->res->version) {
    + case CAMSS_8x16:
    if (is_pix) {
    video->formats = formats_pix_8x16;
    video->nformats = ARRAY_SIZE(formats_pix_8x16);
    @@ -1014,8 +1015,9 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev,
    video->formats = formats_rdi_8x16;
    video->nformats = ARRAY_SIZE(formats_rdi_8x16);
    }
    - } else if (video->camss->res->version == CAMSS_8x96 ||
    - video->camss->res->version == CAMSS_660) {
    + break;
    + case CAMSS_8x96:
    + case CAMSS_660:
    if (is_pix) {
    video->formats = formats_pix_8x96;
    video->nformats = ARRAY_SIZE(formats_pix_8x96);
    @@ -1023,13 +1025,12 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev,
    video->formats = formats_rdi_8x96;
    video->nformats = ARRAY_SIZE(formats_rdi_8x96);
    }
    - } else if (video->camss->res->version == CAMSS_845 ||
    - video->camss->res->version == CAMSS_8250) {
    + break;
    + case CAMSS_845:
    + case CAMSS_8250:
    video->formats = formats_rdi_845;
    video->nformats = ARRAY_SIZE(formats_rdi_845);
    - } else {
    - ret = -EINVAL;
    - goto error_video_register;
    + break;
    }

    ret = msm_video_init_format(video);
    --
    2.42.0
    \
     
     \ /
      Last update: 2023-09-11 23:50    [W:4.179 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site