Skip to content

Commit 2ce94bc

Browse files
committed
Merge tag 'pnp-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull PNP subsystem updates from Rafael Wysocki: - Update MAINTAINERS to cover include/linux/pnp.h and add the linux-acpi list to the PNP entry in it - add the const modifier to the name field definition in struct pnp_driver - drop a pointer case in the RTC CMOS driver that has become redundant All by Corentin Labbe. * tag 'pnp-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: MAINTAINERS: Add linux-acpi list to PNP rtc: cmos: remove useless cast for driver_name PNP: constify driver name PNP: add missing include/linux/pnp.h to MAINTAINERS
2 parents 6d90508 + eaec20c commit 2ce94bc

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

MAINTAINERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13381,7 +13381,9 @@ F: Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt
1338113381

1338213382
PNP SUPPORT
1338313383
M: "Rafael J. Wysocki" <[email protected]>
13384+
1338413385
S: Maintained
13386+
F: include/linux/pnp.h
1338513387
F: drivers/pnp/
1338613388

1338713389
POSIX CLOCKS and TIMERS

drivers/rtc/rtc-cmos.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1345,7 +1345,7 @@ static const struct pnp_device_id rtc_ids[] = {
13451345
MODULE_DEVICE_TABLE(pnp, rtc_ids);
13461346

13471347
static struct pnp_driver cmos_pnp_driver = {
1348-
.name = (char *) driver_name,
1348+
.name = driver_name,
13491349
.id_table = rtc_ids,
13501350
.probe = cmos_pnp_probe,
13511351
.remove = cmos_pnp_remove,

include/linux/pnp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ struct pnp_id {
379379
};
380380

381381
struct pnp_driver {
382-
char *name;
382+
const char *name;
383383
const struct pnp_device_id *id_table;
384384
unsigned int flags;
385385
int (*probe) (struct pnp_dev *dev, const struct pnp_device_id *dev_id);

0 commit comments

Comments
 (0)