Commit 2ce94bc4 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 6d905081 eaec20c7
...@@ -13381,7 +13381,9 @@ F: Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt ...@@ -13381,7 +13381,9 @@ F: Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt
PNP SUPPORT PNP SUPPORT
M: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> M: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
L: linux-acpi@vger.kernel.org
S: Maintained S: Maintained
F: include/linux/pnp.h
F: drivers/pnp/ F: drivers/pnp/
POSIX CLOCKS and TIMERS POSIX CLOCKS and TIMERS
......
...@@ -1345,7 +1345,7 @@ static const struct pnp_device_id rtc_ids[] = { ...@@ -1345,7 +1345,7 @@ static const struct pnp_device_id rtc_ids[] = {
MODULE_DEVICE_TABLE(pnp, rtc_ids); MODULE_DEVICE_TABLE(pnp, rtc_ids);
static struct pnp_driver cmos_pnp_driver = { static struct pnp_driver cmos_pnp_driver = {
.name = (char *) driver_name, .name = driver_name,
.id_table = rtc_ids, .id_table = rtc_ids,
.probe = cmos_pnp_probe, .probe = cmos_pnp_probe,
.remove = cmos_pnp_remove, .remove = cmos_pnp_remove,
......
...@@ -379,7 +379,7 @@ struct pnp_id { ...@@ -379,7 +379,7 @@ struct pnp_id {
}; };
struct pnp_driver { struct pnp_driver {
char *name; const char *name;
const struct pnp_device_id *id_table; const struct pnp_device_id *id_table;
unsigned int flags; unsigned int flags;
int (*probe) (struct pnp_dev *dev, const struct pnp_device_id *dev_id); int (*probe) (struct pnp_dev *dev, const struct pnp_device_id *dev_id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment