Commit 6736a68f authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: Remove duplication between runtime-pm and normal-pm code 



atomisp_suspend() contains a 1:1 copy of atomisp_runtime_suspend() and
the same goes for the resume() functions.

Rename the runtime functions to atomisp_power_on()/_off() and use these
as runtime-pm handlers as well as helper in other places to remove
the code duplication.

Reviewed-by: default avatarAndy Shevchenko <andy@kernel.org>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent f1219d9e

drivers/staging/media/atomisp/pci/atomisp_cmd.c

+4 −4
Original line number Diff line number Diff line
@@ -303,13 +303,13 @@ int atomisp_reset(struct atomisp_device *isp) 


	dev_dbg(isp->dev, "%s\n", __func__);

	atomisp_css_uninit(isp);

	ret = atomisp_runtime_suspend(isp->dev);

	ret = atomisp_power_off(isp->dev);

	if (ret < 0)

		dev_err(isp->dev, "atomisp_runtime_suspend failed, %d\n", ret);

		dev_err(isp->dev, "atomisp_power_off failed, %d\n", ret);



	ret = atomisp_runtime_resume(isp->dev);

	ret = atomisp_power_on(isp->dev);

	if (ret < 0)

		dev_err(isp->dev, "atomisp_runtime_resume failed, %d\n", ret);

		dev_err(isp->dev, "atomisp_power_on failed, %d\n", ret);



	ret = atomisp_css_init(isp);

	if (ret)

drivers/staging/media/atomisp/pci/atomisp_cmd.h

+2 −2
Original line number Diff line number Diff line
@@ -341,6 +341,6 @@ int atomisp_inject_a_fake_event(struct atomisp_sub_device *asd, int *event); 
int atomisp_get_invalid_frame_num(struct video_device *vdev,

				  int *invalid_frame_num);



int atomisp_runtime_suspend(struct device *dev);

int atomisp_runtime_resume(struct device *dev);

int atomisp_power_off(struct device *dev);

int atomisp_power_on(struct device *dev);

#endif /* __ATOMISP_CMD_H__ */

drivers/staging/media/atomisp/pci/atomisp_v4l2.c

+6 −40
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ static int atomisp_mrfld_power(struct atomisp_device *isp, bool enable) 
	return -EBUSY;

}



int atomisp_runtime_suspend(struct device *dev)

int atomisp_power_off(struct device *dev)

{

	struct atomisp_device *isp = (struct atomisp_device *)

				     dev_get_drvdata(dev);
@@ -738,7 +738,7 @@ int atomisp_runtime_suspend(struct device *dev) 
	return atomisp_mrfld_power(isp, false);

}



int atomisp_runtime_resume(struct device *dev)

int atomisp_power_on(struct device *dev)

{

	struct atomisp_device *isp = (struct atomisp_device *)

				     dev_get_drvdata(dev);
@@ -771,7 +771,6 @@ static int __maybe_unused atomisp_suspend(struct device *dev) 
	/* FIXME: only has one isp_subdev at present */

	struct atomisp_sub_device *asd = &isp->asd[0];

	unsigned long flags;

	int ret;



	/*

	 * FIXME: Suspend is not supported by sensors. Abort if any video
@@ -788,45 +787,12 @@ static int __maybe_unused atomisp_suspend(struct device *dev) 
	}

	spin_unlock_irqrestore(&isp->lock, flags);



	ret = atomisp_mrfld_pre_power_down(isp);

	if (ret)

		return ret;



	/*Turn off the ISP d-phy */

	ret = atomisp_ospm_dphy_down(isp);

	if (ret) {

		dev_err(isp->dev, "fail to power off ISP\n");

		return ret;

	}

	cpu_latency_qos_update_request(&isp->pm_qos, PM_QOS_DEFAULT_VALUE);

	return atomisp_mrfld_power(isp, false);

	return atomisp_power_off(dev);

}



static int __maybe_unused atomisp_resume(struct device *dev)

{

	struct atomisp_device *isp = (struct atomisp_device *)

				     dev_get_drvdata(dev);

	int ret;



	ret = atomisp_mrfld_power(isp, true);

	if (ret)

		return ret;



	cpu_latency_qos_update_request(&isp->pm_qos, isp->max_isr_latency);



	/*Turn on ISP d-phy */

	ret = atomisp_ospm_dphy_up(isp);

	if (ret) {

		dev_err(isp->dev, "Failed to power up ISP!.\n");

		return -EINVAL;

	}



	/*restore register values for iUnit and iUnitPHY registers*/

	if (isp->saved_regs.pcicmdsts)

		atomisp_restore_iunit_reg(isp);



	atomisp_freq_scaling(isp, ATOMISP_DFS_MODE_LOW, true);

	return 0;

	return atomisp_power_on(dev);

}



int atomisp_csi_lane_config(struct atomisp_device *isp)
@@ -1755,8 +1721,8 @@ static const struct pci_device_id atomisp_pci_tbl[] = { 
MODULE_DEVICE_TABLE(pci, atomisp_pci_tbl);



static const struct dev_pm_ops atomisp_pm_ops = {

	.runtime_suspend = atomisp_runtime_suspend,

	.runtime_resume = atomisp_runtime_resume,

	.runtime_suspend = atomisp_power_off,

	.runtime_resume = atomisp_power_on,

	.suspend = atomisp_suspend,

	.resume = atomisp_resume,

};