Skip to content

Commit 33312c4

Browse files
author
Jiri Kosina
committed
Merge branch 'for-6.20/pm_ptr-v3' into for-linus
- Use pm_*ptr instead of #ifdef CONFIG_PM* (Bastien Nocera)
2 parents e2ec6d6 + ff7ed83 commit 33312c4

11 files changed

Lines changed: 23 additions & 68 deletions

‎drivers/hid/hid-alps.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -840,10 +840,8 @@ static struct hid_driver alps_driver = {
840840
.raw_event = alps_raw_event,
841841
.input_mapping = alps_input_mapping,
842842
.input_configured = alps_input_configured,
843-
#ifdef CONFIG_PM
844-
.resume = alps_post_resume,
845-
.reset_resume = alps_post_reset,
846-
#endif
843+
.resume = pm_ptr(alps_post_resume),
844+
.reset_resume = pm_ptr(alps_post_reset),
847845
};
848846

849847
module_hid_driver(alps_driver);

‎drivers/hid/hid-appletb-kbd.c‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,6 @@ static void appletb_kbd_remove(struct hid_device *hdev)
466466
hid_hw_stop(hdev);
467467
}
468468

469-
#ifdef CONFIG_PM
470469
static int appletb_kbd_suspend(struct hid_device *hdev, pm_message_t msg)
471470
{
472471
struct appletb_kbd *kbd = hid_get_drvdata(hdev);
@@ -485,7 +484,6 @@ static int appletb_kbd_reset_resume(struct hid_device *hdev)
485484

486485
return 0;
487486
}
488-
#endif
489487

490488
static const struct hid_device_id appletb_kbd_hid_ids[] = {
491489
/* MacBook Pro's 2018, 2019, with T2 chip: iBridge Display */
@@ -501,10 +499,8 @@ static struct hid_driver appletb_kbd_hid_driver = {
501499
.remove = appletb_kbd_remove,
502500
.event = appletb_kbd_hid_event,
503501
.input_configured = appletb_kbd_input_configured,
504-
#ifdef CONFIG_PM
505-
.suspend = appletb_kbd_suspend,
506-
.reset_resume = appletb_kbd_reset_resume,
507-
#endif
502+
.suspend = pm_ptr(appletb_kbd_suspend),
503+
.reset_resume = pm_ptr(appletb_kbd_reset_resume),
508504
.driver.dev_groups = appletb_kbd_groups,
509505
};
510506
module_hid_driver(appletb_kbd_hid_driver);

‎drivers/hid/hid-asus.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,10 +1540,8 @@ static struct hid_driver asus_driver = {
15401540
.remove = asus_remove,
15411541
.input_mapping = asus_input_mapping,
15421542
.input_configured = asus_input_configured,
1543-
#ifdef CONFIG_PM
1544-
.reset_resume = asus_reset_resume,
1545-
.resume = asus_resume,
1546-
#endif
1543+
.reset_resume = pm_ptr(asus_reset_resume),
1544+
.resume = pm_ptr(asus_resume),
15471545
.event = asus_event,
15481546
.raw_event = asus_raw_event
15491547
};

‎drivers/hid/hid-lenovo.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,7 +1422,6 @@ static int lenovo_probe(struct hid_device *hdev,
14221422
return ret;
14231423
}
14241424

1425-
#ifdef CONFIG_PM
14261425
static int lenovo_reset_resume(struct hid_device *hdev)
14271426
{
14281427
switch (hdev->product) {
@@ -1438,7 +1437,6 @@ static int lenovo_reset_resume(struct hid_device *hdev)
14381437

14391438
return 0;
14401439
}
1441-
#endif
14421440

14431441
static void lenovo_remove_tpkbd(struct hid_device *hdev)
14441442
{
@@ -1570,9 +1568,7 @@ static struct hid_driver lenovo_driver = {
15701568
.raw_event = lenovo_raw_event,
15711569
.event = lenovo_event,
15721570
.report_fixup = lenovo_report_fixup,
1573-
#ifdef CONFIG_PM
1574-
.reset_resume = lenovo_reset_resume,
1575-
#endif
1571+
.reset_resume = pm_ptr(lenovo_reset_resume),
15761572
};
15771573
module_hid_driver(lenovo_driver);
15781574

‎drivers/hid/hid-logitech-dj.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1983,7 +1983,6 @@ static int logi_dj_probe(struct hid_device *hdev,
19831983
return retval;
19841984
}
19851985

1986-
#ifdef CONFIG_PM
19871986
static int logi_dj_reset_resume(struct hid_device *hdev)
19881987
{
19891988
struct dj_receiver_dev *djrcv_dev = hid_get_drvdata(hdev);
@@ -1994,7 +1993,6 @@ static int logi_dj_reset_resume(struct hid_device *hdev)
19941993
logi_dj_recv_switch_to_dj_mode(djrcv_dev, 0);
19951994
return 0;
19961995
}
1997-
#endif
19981996

19991997
static void logi_dj_remove(struct hid_device *hdev)
20001998
{
@@ -2150,9 +2148,7 @@ static struct hid_driver logi_djreceiver_driver = {
21502148
.probe = logi_dj_probe,
21512149
.remove = logi_dj_remove,
21522150
.raw_event = logi_dj_raw_event,
2153-
#ifdef CONFIG_PM
2154-
.reset_resume = logi_dj_reset_resume,
2155-
#endif
2151+
.reset_resume = pm_ptr(logi_dj_reset_resume),
21562152
};
21572153

21582154
module_hid_driver(logi_djreceiver_driver);

‎drivers/hid/hid-nintendo.c‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2748,8 +2748,6 @@ static void nintendo_hid_remove(struct hid_device *hdev)
27482748
hid_hw_stop(hdev);
27492749
}
27502750

2751-
#ifdef CONFIG_PM
2752-
27532751
static int nintendo_hid_resume(struct hid_device *hdev)
27542752
{
27552753
struct joycon_ctlr *ctlr = hid_get_drvdata(hdev);
@@ -2792,8 +2790,6 @@ static int nintendo_hid_suspend(struct hid_device *hdev, pm_message_t message)
27922790
return 0;
27932791
}
27942792

2795-
#endif
2796-
27972793
static const struct hid_device_id nintendo_hid_devices[] = {
27982794
{ HID_USB_DEVICE(USB_VENDOR_ID_NINTENDO,
27992795
USB_DEVICE_ID_NINTENDO_PROCON) },
@@ -2827,11 +2823,8 @@ static struct hid_driver nintendo_hid_driver = {
28272823
.probe = nintendo_hid_probe,
28282824
.remove = nintendo_hid_remove,
28292825
.raw_event = nintendo_hid_event,
2830-
2831-
#ifdef CONFIG_PM
2832-
.resume = nintendo_hid_resume,
2833-
.suspend = nintendo_hid_suspend,
2834-
#endif
2826+
.resume = pm_ptr(nintendo_hid_resume),
2827+
.suspend = pm_ptr(nintendo_hid_suspend),
28352828
};
28362829
static int __init nintendo_init(void)
28372830
{

‎drivers/hid/hid-picolcd_core.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@ static int picolcd_raw_event(struct hid_device *hdev,
363363
return 1;
364364
}
365365

366-
#ifdef CONFIG_PM
367366
static int picolcd_suspend(struct hid_device *hdev, pm_message_t message)
368367
{
369368
if (PMSG_IS_AUTO(message))
@@ -401,7 +400,6 @@ static int picolcd_reset_resume(struct hid_device *hdev)
401400
picolcd_leds_set(hid_get_drvdata(hdev));
402401
return 0;
403402
}
404-
#endif
405403

406404
/* initialize keypad input device */
407405
static int picolcd_init_keys(struct picolcd_data *data,
@@ -648,11 +646,9 @@ static struct hid_driver picolcd_driver = {
648646
.probe = picolcd_probe,
649647
.remove = picolcd_remove,
650648
.raw_event = picolcd_raw_event,
651-
#ifdef CONFIG_PM
652-
.suspend = picolcd_suspend,
653-
.resume = picolcd_resume,
654-
.reset_resume = picolcd_reset_resume,
655-
#endif
649+
.suspend = pm_ptr(picolcd_suspend),
650+
.resume = pm_ptr(picolcd_resume),
651+
.reset_resume = pm_ptr(picolcd_reset_resume),
656652
};
657653
module_hid_driver(picolcd_driver);
658654

‎drivers/hid/hid-sensor-hub.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,6 @@ int sensor_hub_input_get_attribute_info(struct hid_sensor_hub_device *hsdev,
422422
}
423423
EXPORT_SYMBOL_GPL(sensor_hub_input_get_attribute_info);
424424

425-
#ifdef CONFIG_PM
426425
static int sensor_hub_suspend(struct hid_device *hdev, pm_message_t message)
427426
{
428427
struct sensor_hub_data *pdata = hid_get_drvdata(hdev);
@@ -463,7 +462,6 @@ static int sensor_hub_reset_resume(struct hid_device *hdev)
463462
{
464463
return 0;
465464
}
466-
#endif
467465

468466
/*
469467
* Handle raw report as sent by device
@@ -772,11 +770,9 @@ static struct hid_driver sensor_hub_driver = {
772770
.remove = sensor_hub_remove,
773771
.raw_event = sensor_hub_raw_event,
774772
.report_fixup = sensor_hub_report_fixup,
775-
#ifdef CONFIG_PM
776-
.suspend = sensor_hub_suspend,
777-
.resume = sensor_hub_resume,
778-
.reset_resume = sensor_hub_reset_resume,
779-
#endif
773+
.suspend = pm_ptr(sensor_hub_suspend),
774+
.resume = pm_ptr(sensor_hub_resume),
775+
.reset_resume = pm_ptr(sensor_hub_reset_resume),
780776
};
781777
module_hid_driver(sensor_hub_driver);
782778

‎drivers/hid/hid-sony.c‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2286,7 +2286,6 @@ static void sony_remove(struct hid_device *hdev)
22862286
hid_hw_stop(hdev);
22872287
}
22882288

2289-
#ifdef CONFIG_PM
22902289

22912290
static int sony_suspend(struct hid_device *hdev, pm_message_t message)
22922291
{
@@ -2321,8 +2320,6 @@ static int sony_resume(struct hid_device *hdev)
23212320
return 0;
23222321
}
23232322

2324-
#endif
2325-
23262323
static const struct hid_device_id sony_devices[] = {
23272324
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER),
23282325
.driver_data = SIXAXIS_CONTROLLER_USB },
@@ -2409,12 +2406,9 @@ static struct hid_driver sony_driver = {
24092406
.remove = sony_remove,
24102407
.report_fixup = sony_report_fixup,
24112408
.raw_event = sony_raw_event,
2412-
2413-
#ifdef CONFIG_PM
2414-
.suspend = sony_suspend,
2415-
.resume = sony_resume,
2416-
.reset_resume = sony_resume,
2417-
#endif
2409+
.suspend = pm_ptr(sony_suspend),
2410+
.resume = pm_ptr(sony_resume),
2411+
.reset_resume = pm_ptr(sony_resume),
24182412
};
24192413

24202414
static int __init sony_init(void)

‎drivers/hid/hid-uclogic-core.c‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ static int uclogic_probe(struct hid_device *hdev,
268268
return rc;
269269
}
270270

271-
#ifdef CONFIG_PM
272271
static int uclogic_resume(struct hid_device *hdev)
273272
{
274273
int rc;
@@ -283,7 +282,6 @@ static int uclogic_resume(struct hid_device *hdev)
283282

284283
return rc;
285284
}
286-
#endif
287285

288286
/**
289287
* uclogic_exec_event_hook - if the received event is hooked schedules the
@@ -636,10 +634,8 @@ static struct hid_driver uclogic_driver = {
636634
.raw_event = uclogic_raw_event,
637635
.input_mapping = uclogic_input_mapping,
638636
.input_configured = uclogic_input_configured,
639-
#ifdef CONFIG_PM
640-
.resume = uclogic_resume,
641-
.reset_resume = uclogic_resume,
642-
#endif
637+
.resume = pm_ptr(uclogic_resume),
638+
.reset_resume = pm_ptr(uclogic_resume),
643639
};
644640
module_hid_driver(uclogic_driver);
645641

0 commit comments

Comments
 (0)