[POWERPC] mpc: Constify & voidify get_property()
Now that get_property() returns a void *, there's no need to cast its return value. Also, treat the return value as const, so we can constify get_property later. mpc* platform changes. Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Родитель
c4c7cba90c
Коммит
8efca49329
|
@ -80,8 +80,8 @@ static void __init mpc834x_itx_setup_arch(void)
|
||||||
|
|
||||||
np = of_find_node_by_type(NULL, "cpu");
|
np = of_find_node_by_type(NULL, "cpu");
|
||||||
if (np != 0) {
|
if (np != 0) {
|
||||||
unsigned int *fp =
|
const unsigned int *fp =
|
||||||
(int *)get_property(np, "clock-frequency", NULL);
|
get_property(np, "clock-frequency", NULL);
|
||||||
if (fp != 0)
|
if (fp != 0)
|
||||||
loops_per_jiffy = *fp / HZ;
|
loops_per_jiffy = *fp / HZ;
|
||||||
else
|
else
|
||||||
|
|
|
@ -84,8 +84,8 @@ static void __init mpc834x_sys_setup_arch(void)
|
||||||
|
|
||||||
np = of_find_node_by_type(NULL, "cpu");
|
np = of_find_node_by_type(NULL, "cpu");
|
||||||
if (np != 0) {
|
if (np != 0) {
|
||||||
unsigned int *fp =
|
const unsigned int *fp =
|
||||||
(int *)get_property(np, "clock-frequency", NULL);
|
get_property(np, "clock-frequency", NULL);
|
||||||
if (fp != 0)
|
if (fp != 0)
|
||||||
loops_per_jiffy = *fp / HZ;
|
loops_per_jiffy = *fp / HZ;
|
||||||
else
|
else
|
||||||
|
|
|
@ -50,7 +50,7 @@ int __init add_bridge(struct device_node *dev)
|
||||||
int len;
|
int len;
|
||||||
struct pci_controller *hose;
|
struct pci_controller *hose;
|
||||||
struct resource rsrc;
|
struct resource rsrc;
|
||||||
int *bus_range;
|
const int *bus_range;
|
||||||
int primary = 1, has_address = 0;
|
int primary = 1, has_address = 0;
|
||||||
phys_addr_t immr = get_immrbase();
|
phys_addr_t immr = get_immrbase();
|
||||||
|
|
||||||
|
@ -60,7 +60,7 @@ int __init add_bridge(struct device_node *dev)
|
||||||
has_address = (of_address_to_resource(dev, 0, &rsrc) == 0);
|
has_address = (of_address_to_resource(dev, 0, &rsrc) == 0);
|
||||||
|
|
||||||
/* Get bus range if any */
|
/* Get bus range if any */
|
||||||
bus_range = (int *)get_property(dev, "bus-range", &len);
|
bus_range = get_property(dev, "bus-range", &len);
|
||||||
if (bus_range == NULL || len < 2 * sizeof(int)) {
|
if (bus_range == NULL || len < 2 * sizeof(int)) {
|
||||||
printk(KERN_WARNING "Can't get bus-range for %s, assume"
|
printk(KERN_WARNING "Can't get bus-range for %s, assume"
|
||||||
" bus 0\n", dev->full_name);
|
" bus 0\n", dev->full_name);
|
||||||
|
|
|
@ -172,9 +172,9 @@ static void __init mpc85xx_ads_setup_arch(void)
|
||||||
|
|
||||||
cpu = of_find_node_by_type(NULL, "cpu");
|
cpu = of_find_node_by_type(NULL, "cpu");
|
||||||
if (cpu != 0) {
|
if (cpu != 0) {
|
||||||
unsigned int *fp;
|
const unsigned int *fp;
|
||||||
|
|
||||||
fp = (int *)get_property(cpu, "clock-frequency", NULL);
|
fp = get_property(cpu, "clock-frequency", NULL);
|
||||||
if (fp != 0)
|
if (fp != 0)
|
||||||
loops_per_jiffy = *fp / HZ;
|
loops_per_jiffy = *fp / HZ;
|
||||||
else
|
else
|
||||||
|
|
|
@ -273,9 +273,9 @@ mpc85xx_cds_setup_arch(void)
|
||||||
|
|
||||||
cpu = of_find_node_by_type(NULL, "cpu");
|
cpu = of_find_node_by_type(NULL, "cpu");
|
||||||
if (cpu != 0) {
|
if (cpu != 0) {
|
||||||
unsigned int *fp;
|
const unsigned int *fp;
|
||||||
|
|
||||||
fp = (int *)get_property(cpu, "clock-frequency", NULL);
|
fp = get_property(cpu, "clock-frequency", NULL);
|
||||||
if (fp != 0)
|
if (fp != 0)
|
||||||
loops_per_jiffy = *fp / HZ;
|
loops_per_jiffy = *fp / HZ;
|
||||||
else
|
else
|
||||||
|
|
|
@ -41,7 +41,7 @@ int __init add_bridge(struct device_node *dev)
|
||||||
int len;
|
int len;
|
||||||
struct pci_controller *hose;
|
struct pci_controller *hose;
|
||||||
struct resource rsrc;
|
struct resource rsrc;
|
||||||
int *bus_range;
|
const int *bus_range;
|
||||||
int primary = 1, has_address = 0;
|
int primary = 1, has_address = 0;
|
||||||
phys_addr_t immr = get_immrbase();
|
phys_addr_t immr = get_immrbase();
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ int __init add_bridge(struct device_node *dev)
|
||||||
has_address = (of_address_to_resource(dev, 0, &rsrc) == 0);
|
has_address = (of_address_to_resource(dev, 0, &rsrc) == 0);
|
||||||
|
|
||||||
/* Get bus range if any */
|
/* Get bus range if any */
|
||||||
bus_range = (int *) get_property(dev, "bus-range", &len);
|
bus_range = get_property(dev, "bus-range", &len);
|
||||||
if (bus_range == NULL || len < 2 * sizeof(int)) {
|
if (bus_range == NULL || len < 2 * sizeof(int)) {
|
||||||
printk(KERN_WARNING "Can't get bus-range for %s, assume"
|
printk(KERN_WARNING "Can't get bus-range for %s, assume"
|
||||||
" bus 0\n", dev->full_name);
|
" bus 0\n", dev->full_name);
|
||||||
|
|
|
@ -323,9 +323,9 @@ mpc86xx_hpcn_setup_arch(void)
|
||||||
|
|
||||||
np = of_find_node_by_type(NULL, "cpu");
|
np = of_find_node_by_type(NULL, "cpu");
|
||||||
if (np != 0) {
|
if (np != 0) {
|
||||||
unsigned int *fp;
|
const unsigned int *fp;
|
||||||
|
|
||||||
fp = (int *)get_property(np, "clock-frequency", NULL);
|
fp = get_property(np, "clock-frequency", NULL);
|
||||||
if (fp != 0)
|
if (fp != 0)
|
||||||
loops_per_jiffy = *fp / HZ;
|
loops_per_jiffy = *fp / HZ;
|
||||||
else
|
else
|
||||||
|
|
|
@ -153,7 +153,7 @@ int __init add_bridge(struct device_node *dev)
|
||||||
int len;
|
int len;
|
||||||
struct pci_controller *hose;
|
struct pci_controller *hose;
|
||||||
struct resource rsrc;
|
struct resource rsrc;
|
||||||
int *bus_range;
|
const int *bus_range;
|
||||||
int has_address = 0;
|
int has_address = 0;
|
||||||
int primary = 0;
|
int primary = 0;
|
||||||
|
|
||||||
|
@ -163,7 +163,7 @@ int __init add_bridge(struct device_node *dev)
|
||||||
has_address = (of_address_to_resource(dev, 0, &rsrc) == 0);
|
has_address = (of_address_to_resource(dev, 0, &rsrc) == 0);
|
||||||
|
|
||||||
/* Get bus range if any */
|
/* Get bus range if any */
|
||||||
bus_range = (int *) get_property(dev, "bus-range", &len);
|
bus_range = get_property(dev, "bus-range", &len);
|
||||||
if (bus_range == NULL || len < 2 * sizeof(int))
|
if (bus_range == NULL || len < 2 * sizeof(int))
|
||||||
printk(KERN_WARNING "Can't get bus-range for %s, assume"
|
printk(KERN_WARNING "Can't get bus-range for %s, assume"
|
||||||
" bus 0\n", dev->full_name);
|
" bus 0\n", dev->full_name);
|
||||||
|
|
|
@ -130,7 +130,7 @@ void mpc7448_hpc2_fixup_irq(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
struct pci_controller *hose;
|
struct pci_controller *hose;
|
||||||
struct device_node *node;
|
struct device_node *node;
|
||||||
unsigned int *interrupt;
|
const unsigned int *interrupt;
|
||||||
int busnr;
|
int busnr;
|
||||||
int len;
|
int len;
|
||||||
u8 slot;
|
u8 slot;
|
||||||
|
@ -147,7 +147,7 @@ void mpc7448_hpc2_fixup_irq(struct pci_dev *dev)
|
||||||
if (!node)
|
if (!node)
|
||||||
printk(KERN_ERR "No pci node found\n");
|
printk(KERN_ERR "No pci node found\n");
|
||||||
|
|
||||||
interrupt = (unsigned int *) get_property(node, "interrupt-map", &len);
|
interrupt = get_property(node, "interrupt-map", &len);
|
||||||
slot = find_slot_by_devfn(interrupt, dev->devfn);
|
slot = find_slot_by_devfn(interrupt, dev->devfn);
|
||||||
pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
|
pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
|
||||||
if (pin == 0 || pin > 4)
|
if (pin == 0 || pin > 4)
|
||||||
|
@ -176,9 +176,9 @@ static void __init mpc7448_hpc2_setup_arch(void)
|
||||||
|
|
||||||
cpu = of_find_node_by_type(NULL, "cpu");
|
cpu = of_find_node_by_type(NULL, "cpu");
|
||||||
if (cpu != 0) {
|
if (cpu != 0) {
|
||||||
unsigned int *fp;
|
const unsigned int *fp;
|
||||||
|
|
||||||
fp = (int *)get_property(cpu, "clock-frequency", NULL);
|
fp = get_property(cpu, "clock-frequency", NULL);
|
||||||
if (fp != 0)
|
if (fp != 0)
|
||||||
loops_per_jiffy = *fp / HZ;
|
loops_per_jiffy = *fp / HZ;
|
||||||
else
|
else
|
||||||
|
|
Загрузка…
Ссылка в новой задаче