projects/linux·commit 2ce94bc4

Merge tag 'pnp-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2ce94bc4 · Linus Torvalds <[email protected]> · 2020-03-30 15:28:12 -07:00

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
Commit
2ce94bc4e056d3e48291aac87a95ebd2a86348ba
Parents
6d905081 · eaec20c7

Merge commit. Changes below are compared with the first parent: 6d905081.

Changes

3 files changed · +4 −2

FileStatusAddDelContent
MAINTAINERSmodified+2−0View file
drivers/rtc/rtc-cmos.cmodified+1−1View file
include/linux/pnp.hmodified+1−1View file

MAINTAINERS

View file
diff --git a/MAINTAINERS b/MAINTAINERS
index 211109e..88bf750 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13381,7 +13381,9 @@ F: Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt
PNP SUPPORT
M: "Rafael J. Wysocki" <[email protected]>
+L: [email protected]
S: Maintained
+F: include/linux/pnp.h
F: drivers/pnp/
POSIX CLOCKS and TIMERS

drivers/rtc/rtc-cmos.c

View file
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index b795fe4..82bfe00 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -1345,7 +1345,7 @@ static const struct pnp_device_id rtc_ids[] = {
MODULE_DEVICE_TABLE(pnp, rtc_ids);
static struct pnp_driver cmos_pnp_driver = {
- .name = (char *) driver_name,
+ .name = driver_name,
.id_table = rtc_ids,
.probe = cmos_pnp_probe,
.remove = cmos_pnp_remove,

include/linux/pnp.h

View file
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index 3b12fd2..b18dca6 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -379,7 +379,7 @@ struct pnp_id {
};
struct pnp_driver {
- char *name;
+ const char *name;
const struct pnp_device_id *id_table;
unsigned int flags;
int (*probe) (struct pnp_dev *dev, const struct pnp_device_id *dev_id);