Commit ccf0dec6 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by David S. Miller

[SPARC/64] constify of_get_property return: drivers

The only unfortunate bit here is that the name field of struct map_info
is not const, so for now we put a cast on the assignment of it.
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6a23acf3
...@@ -39,7 +39,7 @@ MODULE_VERSION("2.0"); ...@@ -39,7 +39,7 @@ MODULE_VERSION("2.0");
static LIST_HEAD(device_list); static LIST_HEAD(device_list);
struct uflash_dev { struct uflash_dev {
char *name; /* device name */ const char *name; /* device name */
struct map_info map; /* mtd map info */ struct map_info map; /* mtd map info */
struct mtd_info *mtd; /* mtd info */ struct mtd_info *mtd; /* mtd info */
}; };
...@@ -80,7 +80,7 @@ int uflash_devinit(struct linux_ebus_device *edev, struct device_node *dp) ...@@ -80,7 +80,7 @@ int uflash_devinit(struct linux_ebus_device *edev, struct device_node *dp)
up->name = of_get_property(dp, "model", NULL); up->name = of_get_property(dp, "model", NULL);
if (up->name && 0 < strlen(up->name)) if (up->name && 0 < strlen(up->name))
up->map.name = up->name; up->map.name = (char *)up->name;
up->map.phys = res->start; up->map.phys = res->start;
......
...@@ -2914,7 +2914,7 @@ static int __devinit gem_get_device_address(struct gem *gp) ...@@ -2914,7 +2914,7 @@ static int __devinit gem_get_device_address(struct gem *gp)
int use_idprom = 1; int use_idprom = 1;
if (pcp != NULL) { if (pcp != NULL) {
unsigned char *addr; const unsigned char *addr;
int len; int len;
addr = of_get_property(pcp->prom_node, "local-mac-address", addr = of_get_property(pcp->prom_node, "local-mac-address",
......
...@@ -2704,7 +2704,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe ...@@ -2704,7 +2704,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe
dev->dev_addr[i] = macaddr[i]; dev->dev_addr[i] = macaddr[i];
macaddr[5]++; macaddr[5]++;
} else { } else {
unsigned char *addr; const unsigned char *addr;
int len; int len;
addr = of_get_property(dp, "local-mac-address", &len); addr = of_get_property(dp, "local-mac-address", &len);
...@@ -3081,7 +3081,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, ...@@ -3081,7 +3081,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
macaddr[5]++; macaddr[5]++;
} else { } else {
#ifdef CONFIG_SPARC #ifdef CONFIG_SPARC
unsigned char *addr; const unsigned char *addr;
int len; int len;
if (qfe_slot != -1 && if (qfe_slot != -1 &&
...@@ -3300,7 +3300,7 @@ static int __devinit hme_sbus_probe(struct of_device *dev, const struct of_devic ...@@ -3300,7 +3300,7 @@ static int __devinit hme_sbus_probe(struct of_device *dev, const struct of_devic
{ {
struct sbus_dev *sdev = to_sbus_device(&dev->dev); struct sbus_dev *sdev = to_sbus_device(&dev->dev);
struct device_node *dp = dev->node; struct device_node *dp = dev->node;
char *model = of_get_property(dp, "model", NULL); const char *model = of_get_property(dp, "model", NULL);
int is_qfe = (match->data != NULL); int is_qfe = (match->data != NULL);
if (!is_qfe && model && !strcmp(model, "SUNW,sbus-qfe")) if (!is_qfe && model && !strcmp(model, "SUNW,sbus-qfe"))
......
...@@ -10996,7 +10996,7 @@ static int __devinit tg3_get_macaddr_sparc(struct tg3 *tp) ...@@ -10996,7 +10996,7 @@ static int __devinit tg3_get_macaddr_sparc(struct tg3 *tp)
struct pcidev_cookie *pcp = pdev->sysdata; struct pcidev_cookie *pcp = pdev->sysdata;
if (pcp != NULL) { if (pcp != NULL) {
unsigned char *addr; const unsigned char *addr;
int len; int len;
addr = of_get_property(pcp->prom_node, "local-mac-address", addr = of_get_property(pcp->prom_node, "local-mac-address",
......
...@@ -1544,7 +1544,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, ...@@ -1544,7 +1544,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
dev->dev_addr[i] = last_phys_addr[i] + 1; dev->dev_addr[i] = last_phys_addr[i] + 1;
#if defined(__sparc__) #if defined(__sparc__)
if (pcp) { if (pcp) {
unsigned char *addr; const unsigned char *addr;
int len; int len;
addr = of_get_property(pcp->prom_node, addr = of_get_property(pcp->prom_node,
......
...@@ -726,7 +726,7 @@ static struct miscdevice envctrl_dev = { ...@@ -726,7 +726,7 @@ static struct miscdevice envctrl_dev = {
* Return: None. * Return: None.
*/ */
static void envctrl_set_mon(struct i2c_child_t *pchild, static void envctrl_set_mon(struct i2c_child_t *pchild,
char *chnl_desc, const char *chnl_desc,
int chnl_no) int chnl_no)
{ {
/* Firmware only has temperature type. It does not distinguish /* Firmware only has temperature type. It does not distinguish
...@@ -763,8 +763,8 @@ static void envctrl_set_mon(struct i2c_child_t *pchild, ...@@ -763,8 +763,8 @@ static void envctrl_set_mon(struct i2c_child_t *pchild,
static void envctrl_init_adc(struct i2c_child_t *pchild, struct device_node *dp) static void envctrl_init_adc(struct i2c_child_t *pchild, struct device_node *dp)
{ {
int i = 0, len; int i = 0, len;
char *pos; const char *pos;
unsigned int *pval; const unsigned int *pval;
/* Firmware describe channels into a stream separated by a '\0'. */ /* Firmware describe channels into a stream separated by a '\0'. */
pos = of_get_property(dp, "channels-description", &len); pos = of_get_property(dp, "channels-description", &len);
...@@ -859,7 +859,7 @@ static void envctrl_init_i2c_child(struct linux_ebus_child *edev_child, ...@@ -859,7 +859,7 @@ static void envctrl_init_i2c_child(struct linux_ebus_child *edev_child,
{ {
int len, i, tbls_size = 0; int len, i, tbls_size = 0;
struct device_node *dp = edev_child->prom_node; struct device_node *dp = edev_child->prom_node;
void *pval; const void *pval;
/* Get device address. */ /* Get device address. */
pval = of_get_property(dp, "reg", &len); pval = of_get_property(dp, "reg", &len);
......
...@@ -190,7 +190,7 @@ static int __init flash_init(void) ...@@ -190,7 +190,7 @@ static int __init flash_init(void)
} }
if (!sdev) { if (!sdev) {
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
struct linux_prom_registers *ebus_regs; const struct linux_prom_registers *ebus_regs;
for_each_ebus(ebus) { for_each_ebus(ebus) {
for_each_ebusdev(edev, ebus) { for_each_ebusdev(edev, ebus) {
......
...@@ -141,7 +141,7 @@ static int copyout(void __user *info, struct openpromio *opp, int len) ...@@ -141,7 +141,7 @@ static int copyout(void __user *info, struct openpromio *opp, int len)
static int opromgetprop(void __user *argp, struct device_node *dp, struct openpromio *op, int bufsize) static int opromgetprop(void __user *argp, struct device_node *dp, struct openpromio *op, int bufsize)
{ {
void *pval; const void *pval;
int len; int len;
if (!dp || if (!dp ||
...@@ -410,7 +410,7 @@ static int opiocget(void __user *argp, DATA *data) ...@@ -410,7 +410,7 @@ static int opiocget(void __user *argp, DATA *data)
struct opiocdesc op; struct opiocdesc op;
struct device_node *dp; struct device_node *dp;
char *str; char *str;
void *pval; const void *pval;
int err, len; int err, len;
if (copy_from_user(&op, argp, sizeof(op))) if (copy_from_user(&op, argp, sizeof(op)))
......
...@@ -35,7 +35,7 @@ struct sbus_bus *sbus_root; ...@@ -35,7 +35,7 @@ struct sbus_bus *sbus_root;
static void __init fill_sbus_device(struct device_node *dp, struct sbus_dev *sdev) static void __init fill_sbus_device(struct device_node *dp, struct sbus_dev *sdev)
{ {
unsigned long base; unsigned long base;
void *pval; const void *pval;
int len, err; int len, err;
sdev->prom_node = dp->node; sdev->prom_node = dp->node;
...@@ -86,7 +86,7 @@ static void __init fill_sbus_device(struct device_node *dp, struct sbus_dev *sde ...@@ -86,7 +86,7 @@ static void __init fill_sbus_device(struct device_node *dp, struct sbus_dev *sde
static void __init sbus_bus_ranges_init(struct device_node *dp, struct sbus_bus *sbus) static void __init sbus_bus_ranges_init(struct device_node *dp, struct sbus_bus *sbus)
{ {
void *pval; const void *pval;
int len; int len;
pval = of_get_property(dp, "ranges", &len); pval = of_get_property(dp, "ranges", &len);
......
...@@ -1403,7 +1403,7 @@ static int __devinit qpti_sbus_probe(struct of_device *dev, const struct of_devi ...@@ -1403,7 +1403,7 @@ static int __devinit qpti_sbus_probe(struct of_device *dev, const struct of_devi
struct scsi_host_template *tpnt = match->data; struct scsi_host_template *tpnt = match->data;
struct Scsi_Host *host; struct Scsi_Host *host;
struct qlogicpti *qpti; struct qlogicpti *qpti;
char *fcode; const char *fcode;
/* Sometimes Antares cards come up not completely /* Sometimes Antares cards come up not completely
* setup, and we get a report of a zero IRQ. * setup, and we get a report of a zero IRQ.
......
...@@ -1387,8 +1387,8 @@ static enum su_type __devinit su_get_type(struct device_node *dp) ...@@ -1387,8 +1387,8 @@ static enum su_type __devinit su_get_type(struct device_node *dp)
struct device_node *ap = of_find_node_by_path("/aliases"); struct device_node *ap = of_find_node_by_path("/aliases");
if (ap) { if (ap) {
char *keyb = of_get_property(ap, "keyboard", NULL); const char *keyb = of_get_property(ap, "keyboard", NULL);
char *ms = of_get_property(ap, "mouse", NULL); const char *ms = of_get_property(ap, "mouse", NULL);
if (keyb) { if (keyb) {
if (dp == of_find_node_by_path(keyb)) if (dp == of_find_node_by_path(keyb))
......
...@@ -266,7 +266,7 @@ static void __devinit cg3_init_fix(struct fb_info *info, int linebytes, ...@@ -266,7 +266,7 @@ static void __devinit cg3_init_fix(struct fb_info *info, int linebytes,
static void __devinit cg3_rdi_maybe_fixup_var(struct fb_var_screeninfo *var, static void __devinit cg3_rdi_maybe_fixup_var(struct fb_var_screeninfo *var,
struct device_node *dp) struct device_node *dp)
{ {
char *params; const char *params;
char *p; char *p;
int ww, hh; int ww, hh;
......
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