History

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

Linus Torvalds committed 6 years ago

Commit 2ce94bc2 parents 6d90508 eaec20c3 files · +4 −2Browse files

Unified · Split

3 files
  1. MAINTAINERS +2 −0
  2. drivers/rtc/rtc-cmos.c +1 −1
  3. include/linux/pnp.h +1 −1
MAINTAINERS+2−0
@@ -13381,7 +13381,9 @@ F: Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt · 13380 unmodified lines
13381 13381
13382PNP SUPPORT13382PNP SUPPORT
13383M: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>13383M: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
13384L: linux-acpi@vger.kernel.org
13384S: Maintained13385S: Maintained
13386F: include/linux/pnp.h
13385F: drivers/pnp/13387F: drivers/pnp/
13386 13388
13387POSIX CLOCKS and TIMERS13389POSIX CLOCKS and TIMERS
drivers/rtc/rtc-cmos.c+1−1
@@ -1345,7 +1345,7 @@ static const struct pnp_device_id rtc_ids[] = { · 1344 unmodified lines
1345MODULE_DEVICE_TABLE(pnp, rtc_ids);1345MODULE_DEVICE_TABLE(pnp, rtc_ids);
1346 1346
1347static struct pnp_driver cmos_pnp_driver = {1347static struct pnp_driver cmos_pnp_driver = {
1348 .name = (char *) driver_name,1348 .name = driver_name,
1349 .id_table = rtc_ids,1349 .id_table = rtc_ids,
1350 .probe = cmos_pnp_probe,1350 .probe = cmos_pnp_probe,
1351 .remove = cmos_pnp_remove,1351 .remove = cmos_pnp_remove,
include/linux/pnp.h+1−1
@@ -379,7 +379,7 @@ struct pnp_id { · 378 unmodified lines
379};379};
380 380
381struct pnp_driver {381struct pnp_driver {
382 char *name;382 const char *name;
383 const struct pnp_device_id *id_table;383 const struct pnp_device_id *id_table;
384 unsigned int flags;384 unsigned int flags;
385 int (*probe) (struct pnp_dev *dev, const struct pnp_device_id *dev_id);385 int (*probe) (struct pnp_dev *dev, const struct pnp_device_id *dev_id);