diff options
| author | Linus Torvalds | 2020-03-30 15:28:12 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2020-03-30 15:28:12 -0700 |
| commit | 2ce94bc4e056d3e48291aac87a95ebd2a86348ba (patch) | |
| tree | 323ac87bd72871024406e317ad89dbae3d6a64cf | |
| parent | 6d90508121fd0c92c276ec731ad6109bf2986cc6 (diff) | |
| parent | eaec20c7362c68176369f11e26dc0f6f994ae2d3 (diff) | |
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
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/rtc/rtc-cmos.c | 2 | ||||
| -rw-r--r-- | include/linux/pnp.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 211109eda314..88bf75088b5a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13381,7 +13381,9 @@ F: Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt PNP SUPPORT M: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> +L: linux-acpi@vger.kernel.org S: Maintained +F: include/linux/pnp.h F: drivers/pnp/ POSIX CLOCKS and TIMERS diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index b795fe4cbd2e..82bfe009a50f 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, diff --git a/include/linux/pnp.h b/include/linux/pnp.h index 3b12fd28af78..b18dca67253d 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); |