Commit 33312c4d authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-6.20/pm_ptr-v3' into for-linus 

- Use pm_*ptr instead of #ifdef CONFIG_PM* (Bastien Nocera)
parents e2ec6d67 ff7ed83b

drivers/hid/hid-alps.c

+2 −4
Original line number Diff line number Diff line
@@ -840,10 +840,8 @@ static struct hid_driver alps_driver = { 
	.raw_event		= alps_raw_event,

	.input_mapping		= alps_input_mapping,

	.input_configured	= alps_input_configured,

#ifdef CONFIG_PM

	.resume			= alps_post_resume,

	.reset_resume		= alps_post_reset,

#endif

	.resume			= pm_ptr(alps_post_resume),

	.reset_resume		= pm_ptr(alps_post_reset),

};



module_hid_driver(alps_driver);

drivers/hid/hid-appletb-kbd.c

+2 −6
Original line number Diff line number Diff line
@@ -466,7 +466,6 @@ static void appletb_kbd_remove(struct hid_device *hdev) 
	hid_hw_stop(hdev);

}



#ifdef CONFIG_PM

static int appletb_kbd_suspend(struct hid_device *hdev, pm_message_t msg)

{

	struct appletb_kbd *kbd = hid_get_drvdata(hdev);
@@ -485,7 +484,6 @@ static int appletb_kbd_reset_resume(struct hid_device *hdev) 


	return 0;

}

#endif



static const struct hid_device_id appletb_kbd_hid_ids[] = {

	/* MacBook Pro's 2018, 2019, with T2 chip: iBridge Display */
@@ -501,10 +499,8 @@ static struct hid_driver appletb_kbd_hid_driver = { 
	.remove = appletb_kbd_remove,

	.event = appletb_kbd_hid_event,

	.input_configured = appletb_kbd_input_configured,

#ifdef CONFIG_PM

	.suspend = appletb_kbd_suspend,

	.reset_resume = appletb_kbd_reset_resume,

#endif

	.suspend = pm_ptr(appletb_kbd_suspend),

	.reset_resume = pm_ptr(appletb_kbd_reset_resume),

	.driver.dev_groups = appletb_kbd_groups,

};

module_hid_driver(appletb_kbd_hid_driver);

drivers/hid/hid-asus.c

+2 −4
Original line number Diff line number Diff line
@@ -1540,10 +1540,8 @@ static struct hid_driver asus_driver = { 
	.remove			= asus_remove,

	.input_mapping          = asus_input_mapping,

	.input_configured       = asus_input_configured,

#ifdef CONFIG_PM

	.reset_resume           = asus_reset_resume,

	.resume					= asus_resume,

#endif

	.reset_resume           = pm_ptr(asus_reset_resume),

	.resume			= pm_ptr(asus_resume),

	.event			= asus_event,

	.raw_event		= asus_raw_event

};

drivers/hid/hid-lenovo.c

+1 −5
Original line number Diff line number Diff line
@@ -1422,7 +1422,6 @@ static int lenovo_probe(struct hid_device *hdev, 
	return ret;

}



#ifdef CONFIG_PM

static int lenovo_reset_resume(struct hid_device *hdev)

{

	switch (hdev->product) {
@@ -1438,7 +1437,6 @@ static int lenovo_reset_resume(struct hid_device *hdev) 


	return 0;

}

#endif



static void lenovo_remove_tpkbd(struct hid_device *hdev)

{
@@ -1570,9 +1568,7 @@ static struct hid_driver lenovo_driver = { 
	.raw_event = lenovo_raw_event,

	.event = lenovo_event,

	.report_fixup = lenovo_report_fixup,

#ifdef CONFIG_PM

	.reset_resume = lenovo_reset_resume,

#endif

	.reset_resume = pm_ptr(lenovo_reset_resume),

};

module_hid_driver(lenovo_driver);

drivers/hid/hid-logitech-dj.c

+1 −5
Original line number Diff line number Diff line
@@ -1983,7 +1983,6 @@ static int logi_dj_probe(struct hid_device *hdev, 
	return retval;

}



#ifdef CONFIG_PM

static int logi_dj_reset_resume(struct hid_device *hdev)

{

	struct dj_receiver_dev *djrcv_dev = hid_get_drvdata(hdev);
@@ -1994,7 +1993,6 @@ static int logi_dj_reset_resume(struct hid_device *hdev) 
	logi_dj_recv_switch_to_dj_mode(djrcv_dev, 0);

	return 0;

}

#endif



static void logi_dj_remove(struct hid_device *hdev)

{
@@ -2150,9 +2148,7 @@ static struct hid_driver logi_djreceiver_driver = { 
	.probe = logi_dj_probe,

	.remove = logi_dj_remove,

	.raw_event = logi_dj_raw_event,

#ifdef CONFIG_PM

	.reset_resume = logi_dj_reset_resume,

#endif

	.reset_resume = pm_ptr(logi_dj_reset_resume),

};



module_hid_driver(logi_djreceiver_driver);