d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- constify devinfo strings to eliminate compile warning

Browse Source 
- remove trailing whitespace
This commit is contained in:
Peter Grehan 2004-02-11 10:15:15 +00:00
parent a0e1020523
commit 69a9f22118
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/powerpc/aim/nexus.c
View File

@ -12,7 +12,7 @@
* no representations about the suitability of this software for any
* purpose. It is provided "as is" without express or implied
* warranty.
*
*
* THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''. M.I.T. DISCLAIMS
* ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@ -89,9 +89,9 @@ static MALLOC_DEFINE(M_NEXUS, "nexus", "nexus device information");
struct nexus_devinfo {
phandle_t ndi_node;
/* Some common properties. */
char *ndi_name;
char *ndi_device_type;
char *ndi_compatible;
const char *ndi_name;
const char *ndi_device_type;
const char *ndi_compatible;
};
struct nexus_softc {
@ -179,7 +179,7 @@ nexus_probe(device_t dev)
* Allow devices to identify
*/
bus_generic_probe(dev);
/*
* Now walk the OFW tree to locate top-level devices
*/
@ -219,17 +219,17 @@ nexus_add_child(device_t dev, int order, const char *name, int unit)
struct nexus_devinfo *dinfo;
child = device_add_child_ordered(dev, order, name, unit);
if (child == NULL)
if (child == NULL)
return (NULL);
dinfo = malloc(sizeof(struct nexus_devinfo), M_NEXUS, M_NOWAIT|M_ZERO);
if (dinfo == NULL)
return (NULL);
dinfo->ndi_node = -1;
dinfo->ndi_name = name;
device_set_ivars(child, dinfo);
device_set_ivars(child, dinfo);
return (child);
}

18
sys/powerpc/powerpc/nexus.c
View File

@ -12,7 +12,7 @@
* no representations about the suitability of this software for any
* purpose. It is provided "as is" without express or implied
* warranty.
*
*
* THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''. M.I.T. DISCLAIMS
* ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
@ -89,9 +89,9 @@ static MALLOC_DEFINE(M_NEXUS, "nexus", "nexus device information");
struct nexus_devinfo {
phandle_t ndi_node;
/* Some common properties. */
char *ndi_name;
char *ndi_device_type;
char *ndi_compatible;
const char *ndi_name;
const char *ndi_device_type;
const char *ndi_compatible;
};
struct nexus_softc {
@ -179,7 +179,7 @@ nexus_probe(device_t dev)
* Allow devices to identify
*/
bus_generic_probe(dev);
/*
* Now walk the OFW tree to locate top-level devices
*/
@ -219,17 +219,17 @@ nexus_add_child(device_t dev, int order, const char *name, int unit)
struct nexus_devinfo *dinfo;
child = device_add_child_ordered(dev, order, name, unit);
if (child == NULL)
if (child == NULL)
return (NULL);
dinfo = malloc(sizeof(struct nexus_devinfo), M_NEXUS, M_NOWAIT|M_ZERO);
if (dinfo == NULL)
return (NULL);
dinfo->ndi_node = -1;
dinfo->ndi_name = name;
device_set_ivars(child, dinfo);
device_set_ivars(child, dinfo);
return (child);
}