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

staging: vboxvideo: Fixup some #ifdef-s 



Add #ifdef CONFIG_PM_SLEEP around the suspend/hibernate functions.

Remove unnecessary #ifdef CONFIG_COMPAT, the .compat_ioctl member is
always available and if CONFIG_COMPAT is not set then drm_compat_ioctl
is defined to NULL.

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

drivers/staging/vboxvideo/vbox_drv.c

+5 −3
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ static void vbox_pci_remove(struct pci_dev *pdev) 
	drm_dev_put(&vbox->ddev);

}



#ifdef CONFIG_PM_SLEEP

static int vbox_pm_suspend(struct device *dev)

{

	struct vbox_private *vbox = dev_get_drvdata(dev);
@@ -172,13 +173,16 @@ static const struct dev_pm_ops vbox_pm_ops = { 
	.poweroff = vbox_pm_poweroff,

	.restore = vbox_pm_resume,

};

#endif



static struct pci_driver vbox_pci_driver = {

	.name = DRIVER_NAME,

	.id_table = pciidlist,

	.probe = vbox_pci_probe,

	.remove = vbox_pci_remove,

#ifdef CONFIG_PM_SLEEP

	.driver.pm = &vbox_pm_ops,

#endif

};



static const struct file_operations vbox_fops = {
@@ -186,11 +190,9 @@ static const struct file_operations vbox_fops = { 
	.open = drm_open,

	.release = drm_release,

	.unlocked_ioctl = drm_ioctl,

	.compat_ioctl = drm_compat_ioctl,

	.mmap = vbox_mmap,

	.poll = drm_poll,

#ifdef CONFIG_COMPAT

	.compat_ioctl = drm_compat_ioctl,

#endif

	.read = drm_read,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE