Commit 3498ea8b authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

staging: vboxvideo: Fold vbox_drm_resume() into vbox_pm_resume() 



vbox_pm_resume() is the only caller of vbox_drm_resume(), so squash the
2 functions into 1.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 01648890

drivers/staging/vboxvideo/vbox_drv.c

+11 −17
Original line number Diff line number Diff line
@@ -152,22 +152,6 @@ static int vbox_drm_thaw(struct vbox_private *vbox) 
	return 0;

}



static int vbox_drm_resume(struct vbox_private *vbox)

{

	int ret;



	if (pci_enable_device(vbox->ddev.pdev))

		return -EIO;



	ret = vbox_drm_thaw(vbox);

	if (ret)

		return ret;



	drm_kms_helper_poll_enable(&vbox->ddev);



	return 0;

}



static int vbox_pm_suspend(struct device *dev)

{

	struct vbox_private *vbox = dev_get_drvdata(dev);
@@ -186,8 +170,18 @@ static int vbox_pm_suspend(struct device *dev) 
static int vbox_pm_resume(struct device *dev)

{

	struct vbox_private *vbox = dev_get_drvdata(dev);

	int ret;



	return vbox_drm_resume(vbox);

	if (pci_enable_device(vbox->ddev.pdev))

		return -EIO;



	ret = vbox_drm_thaw(vbox);

	if (ret)

		return ret;



	drm_kms_helper_poll_enable(&vbox->ddev);



	return 0;

}



static int vbox_pm_freeze(struct device *dev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE