Commit 53b01a5f authored by Vikram Sharma's avatar Vikram Sharma Committed by Hans Verkuil
Browse files

media: qcom: camss: reducing the repitious error message string 



Introducing a new function camss_link_err to avoid repition of
same error message, improving code maintainability.

Signed-off-by: default avatarVikram Sharma <quic_vikramsa@quicinc.com>
Reviewed-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
parent c1059736

drivers/media/platform/qcom/camss/camss.c

+35 −23
Original line number Diff line number Diff line
@@ -1993,6 +1993,24 @@ static int camss_init_subdevices(struct camss *camss) 
	return 0;

}



/*

 * camss_link_entities - Register subdev nodes and create links

 * camss_link_err - print error in case link creation fails

 * @src_name: name for source of the link

 * @sink_name: name for sink of the link

 */

inline void camss_link_err(struct camss *camss,

			   const char *src_name,

			   const char *sink_name,

			   int ret)

{

	dev_err(camss->dev,

		"Failed to link %s->%s entities: %d\n",

		src_name,

		sink_name,

		ret);

}



/*

 * camss_link_entities - Register subdev nodes and create links

 * @camss: CAMSS device
@@ -2012,8 +2030,7 @@ static int camss_link_entities(struct camss *camss) 
						    MSM_CSID_PAD_SINK,

						    0);

			if (ret < 0) {

				dev_err(camss->dev,

					"Failed to link %s->%s entities: %d\n",

				camss_link_err(camss,

					       camss->csiphy[i].subdev.entity.name,

					       camss->csid[j].subdev.entity.name,

					       ret);
@@ -2031,8 +2048,7 @@ static int camss_link_entities(struct camss *camss) 
							    MSM_ISPIF_PAD_SINK,

							    0);

				if (ret < 0) {

					dev_err(camss->dev,

						"Failed to link %s->%s entities: %d\n",

					camss_link_err(camss,

						       camss->csid[i].subdev.entity.name,

						       camss->ispif->line[j].subdev.entity.name,

						       ret);
@@ -2053,9 +2069,7 @@ static int camss_link_entities(struct camss *camss) 
								    MSM_VFE_PAD_SINK,

								    0);

					if (ret < 0) {

						dev_err(camss->dev,

							"Failed to link %s->%s entities: %d\n",

							ispif->entity.name,

						camss_link_err(camss, ispif->entity.name,

							       vfe->entity.name,

							       ret);

						return ret;
@@ -2074,9 +2088,7 @@ static int camss_link_entities(struct camss *camss) 
								    MSM_VFE_PAD_SINK,

								    0);

					if (ret < 0) {

						dev_err(camss->dev,

							"Failed to link %s->%s entities: %d\n",

							csid->entity.name,

						camss_link_err(camss, csid->entity.name,

							       vfe->entity.name,

							       ret);

						return ret;
@@ -2227,9 +2239,9 @@ static int camss_subdev_notifier_complete(struct v4l2_async_notifier *async) 
				input, MSM_CSIPHY_PAD_SINK,

				MEDIA_LNK_FL_IMMUTABLE | MEDIA_LNK_FL_ENABLED);

			if (ret < 0) {

				dev_err(camss->dev,

					"Failed to link %s->%s entities: %d\n",

					sensor->name, input->name, ret);

				camss_link_err(camss, sensor->name,

					       input->name,

					       ret);

				return ret;

			}

		}