Commit ff7ed83b authored by Bastien Nocera's avatar Bastien Nocera Committed by Jiri Kosina
Browse files

HID: sony: Use pm_ptr instead of #ifdef CONFIG_PM 



This increases build coverage and allows to drop an #ifdef.

Signed-off-by: default avatarBastien Nocera <hadess@hadess.net>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent a864d16b

drivers/hid/hid-sony.c

+3 −9
Original line number Diff line number Diff line
@@ -2179,7 +2179,6 @@ static void sony_remove(struct hid_device *hdev) 
	hid_hw_stop(hdev);

}



#ifdef CONFIG_PM



static int sony_suspend(struct hid_device *hdev, pm_message_t message)

{
@@ -2214,8 +2213,6 @@ static int sony_resume(struct hid_device *hdev) 
	return 0;

}



#endif



static const struct hid_device_id sony_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER),

		.driver_data = SIXAXIS_CONTROLLER_USB },
@@ -2284,12 +2281,9 @@ static struct hid_driver sony_driver = { 
	.remove           = sony_remove,

	.report_fixup     = sony_report_fixup,

	.raw_event        = sony_raw_event,



#ifdef CONFIG_PM

	.suspend          = sony_suspend,

	.resume	          = sony_resume,

	.reset_resume     = sony_resume,

#endif

	.suspend          = pm_ptr(sony_suspend),

	.resume	          = pm_ptr(sony_resume),

	.reset_resume     = pm_ptr(sony_resume),

};



static int __init sony_init(void)