| Message ID | 20250513142353.2572563-7-vladimir.zapolskiy@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | media: qcom: camss: a number of cleanups and fixes | expand |
On 13/05/2025 15:23, Vladimir Zapolskiy wrote: > For sake of code simplicity and readability reduce the function code by > one level of indentation, the change is non-functional. > > Signed-off-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org> > --- > drivers/media/platform/qcom/camss/camss.c | 50 +++++++++++------------ > 1 file changed, 25 insertions(+), 25 deletions(-) > > diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c > index 4e91e4b6ef52..39c5472f4552 100644 > --- a/drivers/media/platform/qcom/camss/camss.c > +++ b/drivers/media/platform/qcom/camss/camss.c > @@ -3385,35 +3385,35 @@ static int camss_subdev_notifier_complete(struct v4l2_async_notifier *async) > struct camss *camss = container_of(async, struct camss, notifier); > struct v4l2_device *v4l2_dev = &camss->v4l2_dev; > struct v4l2_subdev *sd; > - int ret; > > list_for_each_entry(sd, &v4l2_dev->subdevs, list) { > - if (sd->host_priv) { > - struct media_entity *sensor = &sd->entity; > - struct csiphy_device *csiphy = > - (struct csiphy_device *) sd->host_priv; > - struct media_entity *input = &csiphy->subdev.entity; > - unsigned int i; > - > - for (i = 0; i < sensor->num_pads; i++) { > - if (sensor->pads[i].flags & MEDIA_PAD_FL_SOURCE) > - break; > - } > - if (i == sensor->num_pads) { > - dev_err(camss->dev, > - "No source pad in external entity\n"); > - return -EINVAL; > - } > + struct csiphy_device *csiphy = sd->host_priv; > + struct media_entity *input, *sensor; > + unsigned int i; > + int ret; > + > + if (!csiphy) > + continue; > + > + input = &csiphy->subdev.entity; > + sensor = &sd->entity; > + > + for (i = 0; i < sensor->num_pads; i++) { > + if (sensor->pads[i].flags & MEDIA_PAD_FL_SOURCE) > + break; > + } > + if (i == sensor->num_pads) { > + dev_err(camss->dev, > + "No source pad in external entity\n"); > + return -EINVAL; > + } > > - ret = media_create_pad_link(sensor, i, > - input, MSM_CSIPHY_PAD_SINK, > + ret = media_create_pad_link(sensor, i, input, > + MSM_CSIPHY_PAD_SINK, > MEDIA_LNK_FL_IMMUTABLE | MEDIA_LNK_FL_ENABLED); > - if (ret < 0) { > - camss_link_err(camss, sensor->name, > - input->name, > - ret); > - return ret; > - } > + if (ret < 0) { > + camss_link_err(camss, sensor->name, input->name, ret); > + return ret; > } > } > > -- > 2.45.2 > > Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c index 4e91e4b6ef52..39c5472f4552 100644 --- a/drivers/media/platform/qcom/camss/camss.c +++ b/drivers/media/platform/qcom/camss/camss.c @@ -3385,35 +3385,35 @@ static int camss_subdev_notifier_complete(struct v4l2_async_notifier *async) struct camss *camss = container_of(async, struct camss, notifier); struct v4l2_device *v4l2_dev = &camss->v4l2_dev; struct v4l2_subdev *sd; - int ret; list_for_each_entry(sd, &v4l2_dev->subdevs, list) { - if (sd->host_priv) { - struct media_entity *sensor = &sd->entity; - struct csiphy_device *csiphy = - (struct csiphy_device *) sd->host_priv; - struct media_entity *input = &csiphy->subdev.entity; - unsigned int i; - - for (i = 0; i < sensor->num_pads; i++) { - if (sensor->pads[i].flags & MEDIA_PAD_FL_SOURCE) - break; - } - if (i == sensor->num_pads) { - dev_err(camss->dev, - "No source pad in external entity\n"); - return -EINVAL; - } + struct csiphy_device *csiphy = sd->host_priv; + struct media_entity *input, *sensor; + unsigned int i; + int ret; + + if (!csiphy) + continue; + + input = &csiphy->subdev.entity; + sensor = &sd->entity; + + for (i = 0; i < sensor->num_pads; i++) { + if (sensor->pads[i].flags & MEDIA_PAD_FL_SOURCE) + break; + } + if (i == sensor->num_pads) { + dev_err(camss->dev, + "No source pad in external entity\n"); + return -EINVAL; + } - ret = media_create_pad_link(sensor, i, - input, MSM_CSIPHY_PAD_SINK, + ret = media_create_pad_link(sensor, i, input, + MSM_CSIPHY_PAD_SINK, MEDIA_LNK_FL_IMMUTABLE | MEDIA_LNK_FL_ENABLED); - if (ret < 0) { - camss_link_err(camss, sensor->name, - input->name, - ret); - return ret; - } + if (ret < 0) { + camss_link_err(camss, sensor->name, input->name, ret); + return ret; } }
For sake of code simplicity and readability reduce the function code by one level of indentation, the change is non-functional. Signed-off-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org> --- drivers/media/platform/qcom/camss/camss.c | 50 +++++++++++------------ 1 file changed, 25 insertions(+), 25 deletions(-)