diff options
| author | christos <christos@NetBSD.org> | 2021-06-21 03:14:40 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2021-06-21 03:14:40 +0000 |
| commit | ff7ffaf801de7ab2d8800b020775aef6b108ba56 (patch) | |
| tree | 54cc0e9791c935fa02f9c266f7c87888b4a98a02 /sys/dev | |
| parent | 91309da948c73e1da92f20b01282632761bc0e06 (diff) | |
fix proplib deprecation
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/dm/dm_ioctl.c | 8 | ||||
| -rw-r--r-- | sys/dev/pci/machfb.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/radeonfb.c | 6 | ||||
| -rw-r--r-- | sys/dev/sdmmc/if_bwfm_sdio.c | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/sys/dev/dm/dm_ioctl.c b/sys/dev/dm/dm_ioctl.c index 9b69f8a4b36..b2aff99ec9d 100644 --- a/sys/dev/dm/dm_ioctl.c +++ b/sys/dev/dm/dm_ioctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: dm_ioctl.c,v 1.51 2021/05/07 09:53:39 hannken Exp $ */ +/* $NetBSD: dm_ioctl.c,v 1.52 2021/06/21 03:16:43 christos Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.51 2021/05/07 09:53:39 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.52 2021/06/21 03:16:43 christos Exp $"); /* * Locking is used to synchronise between ioctl calls and between dm_table's @@ -910,8 +910,8 @@ dm_table_status_ioctl(prop_dictionary_t dm_dict) name = NULL; flags = 0; - prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_NAME, &name); - prop_dictionary_get_cstring_nocopy(dm_dict, DM_IOCTL_UUID, &uuid); + prop_dictionary_get_string(dm_dict, DM_IOCTL_NAME, &name); + prop_dictionary_get_string(dm_dict, DM_IOCTL_UUID, &uuid); prop_dictionary_get_uint32(dm_dict, DM_IOCTL_FLAGS, &flags); prop_dictionary_get_uint32(dm_dict, DM_IOCTL_MINOR, &minor); diff --git a/sys/dev/pci/machfb.c b/sys/dev/pci/machfb.c index 8807d241921..5d8a562e77e 100644 --- a/sys/dev/pci/machfb.c +++ b/sys/dev/pci/machfb.c @@ -1,4 +1,4 @@ -/* $NetBSD: machfb.c,v 1.104 2021/04/24 23:36:57 thorpej Exp $ */ +/* $NetBSD: machfb.c,v 1.105 2021/06/21 03:19:21 christos Exp $ */ /* * Copyright (c) 2002 Bang Jun-Young @@ -34,7 +34,7 @@ #include <sys/cdefs.h> __KERNEL_RCSID(0, - "$NetBSD: machfb.c,v 1.104 2021/04/24 23:36:57 thorpej Exp $"); + "$NetBSD: machfb.c,v 1.105 2021/06/21 03:19:21 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -520,7 +520,7 @@ mach64_attach(device_t parent, device_t self, void *aux) default_mode.hdisplay = width; default_mode.vdisplay = height; - prop_dictionary_get_cstring_nocopy(device_properties(sc->sc_dev), + prop_dictionary_get_string(device_properties(sc->sc_dev), "videomode", &mptr); memset(&sc->sc_ei, 0, sizeof(sc->sc_ei)); diff --git a/sys/dev/pci/radeonfb.c b/sys/dev/pci/radeonfb.c index 2260a328d02..0d678f10bf8 100644 --- a/sys/dev/pci/radeonfb.c +++ b/sys/dev/pci/radeonfb.c @@ -1,4 +1,4 @@ -/* $NetBSD: radeonfb.c,v 1.114 2021/04/24 23:36:57 thorpej Exp $ */ +/* $NetBSD: radeonfb.c,v 1.115 2021/06/21 03:21:17 christos Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.114 2021/04/24 23:36:57 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.115 2021/06/21 03:21:17 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -812,7 +812,7 @@ radeonfb_attach(device_t parent, device_t dev, void *aux) /* setup default video mode from devprop (allows PROM override) */ sc->sc_defaultmode = radeonfb_default_mode; - if (prop_dictionary_get_cstring_nocopy(device_properties(sc->sc_dev), + if (prop_dictionary_get_string(device_properties(sc->sc_dev), "videomode", &mptr)) { strncpy(sc->sc_modebuf, mptr, sizeof(sc->sc_modebuf)); diff --git a/sys/dev/sdmmc/if_bwfm_sdio.c b/sys/dev/sdmmc/if_bwfm_sdio.c index a4bb4259882..270a0bccdfc 100644 --- a/sys/dev/sdmmc/if_bwfm_sdio.c +++ b/sys/dev/sdmmc/if_bwfm_sdio.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_bwfm_sdio.c,v 1.25 2021/01/27 03:10:21 thorpej Exp $ */ +/* $NetBSD: if_bwfm_sdio.c,v 1.26 2021/06/21 03:17:59 christos Exp $ */ /* $OpenBSD: if_bwfm_sdio.c,v 1.1 2017/10/11 17:19:50 patrick Exp $ */ /* * Copyright (c) 2010-2016 Broadcom Corporation @@ -565,7 +565,7 @@ bwfm_fdt_find_phandle(device_t self, device_t parent) /* locate in FDT */ dict = device_properties(self); - if (prop_dictionary_get_cstring_nocopy(dict, "fdt-path", &str)) { + if (prop_dictionary_get_string(dict, "fdt-path", &str)) { /* search in FDT */ phandle = OF_finddevice(str); } else { @@ -576,7 +576,7 @@ bwfm_fdt_find_phandle(device_t self, device_t parent) return -1; /* locate in FDT */ dict = device_properties(dev); - if (!prop_dictionary_get_cstring_nocopy(dict, "fdt-path", &str)) + if (!prop_dictionary_get_string(dict, "fdt-path", &str)) return -1; /* are we the only FDT child ? */ |
