Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04e02151 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Mauro Carvalho Chehab
Browse files

[media] staging: omap4iss: remove pads prefix from *_create_pads_links() 



The functions that create ISS internal and external entities links are
called *_create_pads_links() but the "pads" prefix is redundant since
the driver doesn't handle any other kind of link so it can be removed.

Suggested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 06a1368f

drivers/staging/media/omap4iss/iss.c

+6 −6
Original line number Diff line number Diff line
@@ -1273,28 +1273,28 @@ static int iss_register_entities(struct iss_device *iss) 
}



/*

 * iss_create_pads_links() - Pads links creation for the subdevices

 * iss_create_links() - Pads links creation for the subdevices

 * @iss : Pointer to ISS device

 *

 * return negative error code or zero on success

 */

static int iss_create_pads_links(struct iss_device *iss)

static int iss_create_links(struct iss_device *iss)

{

	int ret;



	ret = omap4iss_csi2_create_pads_links(iss);

	ret = omap4iss_csi2_create_links(iss);

	if (ret < 0) {

		dev_err(iss->dev, "CSI2 pads links creation failed\n");

		return ret;

	}



	ret = omap4iss_ipipeif_create_pads_links(iss);

	ret = omap4iss_ipipeif_create_links(iss);

	if (ret < 0) {

		dev_err(iss->dev, "ISP IPIPEIF pads links creation failed\n");

		return ret;

	}



	ret = omap4iss_resizer_create_pads_links(iss);

	ret = omap4iss_resizer_create_links(iss);

	if (ret < 0) {

		dev_err(iss->dev, "ISP RESIZER pads links creation failed\n");

		return ret;
@@ -1491,7 +1491,7 @@ static int iss_probe(struct platform_device *pdev) 
	if (ret < 0)

		goto error_modules;



	ret = iss_create_pads_links(iss);

	ret = iss_create_links(iss);

	if (ret < 0)

		goto error_entities;

drivers/staging/media/omap4iss/iss_csi2.c

+2 −2
Original line number Diff line number Diff line
@@ -1339,12 +1339,12 @@ int omap4iss_csi2_init(struct iss_device *iss) 
}



/*

 * omap4iss_csi2_create_pads_links() - CSI2 pads links creation

 * omap4iss_csi2_create_links() - CSI2 pads links creation

 * @iss: Pointer to ISS device

 *

 * return negative error code or zero on success

 */

int omap4iss_csi2_create_pads_links(struct iss_device *iss)

int omap4iss_csi2_create_links(struct iss_device *iss)

{

	struct iss_csi2_device *csi2a = &iss->csi2a;

	struct iss_csi2_device *csi2b = &iss->csi2b;

drivers/staging/media/omap4iss/iss_csi2.h

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ struct iss_csi2_device { 
void omap4iss_csi2_isr(struct iss_csi2_device *csi2);

int omap4iss_csi2_reset(struct iss_csi2_device *csi2);

int omap4iss_csi2_init(struct iss_device *iss);

int omap4iss_csi2_create_pads_links(struct iss_device *iss);

int omap4iss_csi2_create_links(struct iss_device *iss);

void omap4iss_csi2_cleanup(struct iss_device *iss);

void omap4iss_csi2_unregister_entities(struct iss_csi2_device *csi2);

int omap4iss_csi2_register_entities(struct iss_csi2_device *csi2,

drivers/staging/media/omap4iss/iss_ipipeif.c

+2 −2
Original line number Diff line number Diff line
@@ -815,12 +815,12 @@ int omap4iss_ipipeif_init(struct iss_device *iss) 
}



/*

 * omap4iss_ipipeif_create_pads_links() - IPIPEIF pads links creation

 * omap4iss_ipipeif_create_links() - IPIPEIF pads links creation

 * @iss: Pointer to ISS device

 *

 * return negative error code or zero on success

 */

int omap4iss_ipipeif_create_pads_links(struct iss_device *iss)

int omap4iss_ipipeif_create_links(struct iss_device *iss)

{

	struct iss_ipipeif_device *ipipeif = &iss->ipipeif;

drivers/staging/media/omap4iss/iss_ipipeif.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct iss_ipipeif_device { 
struct iss_device;



int omap4iss_ipipeif_init(struct iss_device *iss);

int omap4iss_ipipeif_create_pads_links(struct iss_device *iss);

int omap4iss_ipipeif_create_links(struct iss_device *iss);

void omap4iss_ipipeif_cleanup(struct iss_device *iss);

int omap4iss_ipipeif_register_entities(struct iss_ipipeif_device *ipipeif,

				       struct v4l2_device *vdev);