Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 123365
b: refs/heads/master
c: ab04323
h: refs/heads/master
i:
  123363: 17931ab
v: v3
  • Loading branch information
David S. Miller committed Dec 6, 2008
1 parent eae53fe commit a7b186b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 657f201df693c26d294f6c789b8a87cd8c16eb53
refs/heads/master: ab04323e5b8c50d6e8f7f4a3e4118ba5fcba61a1
6 changes: 3 additions & 3 deletions trunk/arch/sparc/include/asm/openprom_32.h
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@ struct linux_romvec {
struct linux_nodeops {
int (*no_nextnode)(int node);
int (*no_child)(int node);
int (*no_proplen)(int node, char *name);
int (*no_getprop)(int node, char *name, char *val);
int (*no_setprop)(int node, char *name, char *val, int len);
int (*no_proplen)(int node, const char *name);
int (*no_getprop)(int node, const char *name, char *val);
int (*no_setprop)(int node, const char *name, char *val, int len);
char * (*no_nextprop)(int node, char *name);
};

Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/sparc/include/asm/oplib_32.h
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,12 @@ extern int prom_getsibling(int node);
/* Get the length, at the passed node, of the given property type.
* Returns -1 on error (ie. no such property at this node).
*/
extern int prom_getproplen(int thisnode, char *property);
extern int prom_getproplen(int thisnode, const char *property);

/* Fetch the requested property using the given buffer. Returns
* the number of bytes the prom put into your buffer or -1 on error.
*/
extern int __must_check prom_getproperty(int thisnode, char *property,
extern int __must_check prom_getproperty(int thisnode, const char *property,
char *prop_buffer, int propbuf_size);

/* Acquire an integer property. */
Expand Down Expand Up @@ -246,7 +246,7 @@ extern int prom_node_has_property(int node, char *property);
/* Set the indicated property at the given node with the passed value.
* Returns the number of bytes of your value that the prom took.
*/
extern int prom_setprop(int node, char *prop_name, char *prop_value,
extern int prom_setprop(int node, const char *prop_name, char *prop_value,
int value_size);

extern int prom_pathtoinode(char *path);
Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/sparc/prom/tree_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ int prom_getsibling(int node)
/* Return the length in bytes of property 'prop' at node 'node'.
* Return -1 on error.
*/
int prom_getproplen(int node, char *prop)
int prom_getproplen(int node, const char *prop)
{
int ret;
unsigned long flags;
Expand All @@ -104,7 +104,7 @@ int prom_getproplen(int node, char *prop)
* 'buffer' which has a size of 'bufsize'. If the acquisition
* was successful the length will be returned, else -1 is returned.
*/
int prom_getproperty(int node, char *prop, char *buffer, int bufsize)
int prom_getproperty(int node, const char *prop, char *buffer, int bufsize)
{
int plen, ret;
unsigned long flags;
Expand Down Expand Up @@ -303,7 +303,7 @@ int prom_node_has_property(int node, char *prop)
/* Set property 'pname' at node 'node' to value 'value' which has a length
* of 'size' bytes. Return the number of bytes the prom accepted.
*/
int prom_setprop(int node, char *pname, char *value, int size)
int prom_setprop(int node, const char *pname, char *value, int size)
{
unsigned long flags;
int ret;
Expand Down

0 comments on commit a7b186b

Please sign in to comment.