diff options
Diffstat (limited to 'drivers/pci/hotplug')
-rw-r--r-- | drivers/pci/hotplug/rpaphp_core.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c index 076bd6dcafae..7288a3eccfb3 100644 --- a/drivers/pci/hotplug/rpaphp_core.c +++ b/drivers/pci/hotplug/rpaphp_core.c | |||
@@ -176,16 +176,16 @@ static int get_max_bus_speed(struct hotplug_slot *hotplug_slot, enum pci_bus_spe | |||
176 | return 0; | 176 | return 0; |
177 | } | 177 | } |
178 | 178 | ||
179 | static int get_children_props(struct device_node *dn, int **drc_indexes, | 179 | static int get_children_props(struct device_node *dn, const int **drc_indexes, |
180 | int **drc_names, int **drc_types, int **drc_power_domains) | 180 | const int **drc_names, const int **drc_types, |
181 | const int **drc_power_domains) | ||
181 | { | 182 | { |
182 | int *indexes, *names; | 183 | const int *indexes, *names, *types, *domains; |
183 | int *types, *domains; | ||
184 | 184 | ||
185 | indexes = (int *) get_property(dn, "ibm,drc-indexes", NULL); | 185 | indexes = get_property(dn, "ibm,drc-indexes", NULL); |
186 | names = (int *) get_property(dn, "ibm,drc-names", NULL); | 186 | names = get_property(dn, "ibm,drc-names", NULL); |
187 | types = (int *) get_property(dn, "ibm,drc-types", NULL); | 187 | types = get_property(dn, "ibm,drc-types", NULL); |
188 | domains = (int *) get_property(dn, "ibm,drc-power-domains", NULL); | 188 | domains = get_property(dn, "ibm,drc-power-domains", NULL); |
189 | 189 | ||
190 | if (!indexes || !names || !types || !domains) { | 190 | if (!indexes || !names || !types || !domains) { |
191 | /* Slot does not have dynamically-removable children */ | 191 | /* Slot does not have dynamically-removable children */ |
@@ -212,13 +212,13 @@ static int get_children_props(struct device_node *dn, int **drc_indexes, | |||
212 | int rpaphp_get_drc_props(struct device_node *dn, int *drc_index, | 212 | int rpaphp_get_drc_props(struct device_node *dn, int *drc_index, |
213 | char **drc_name, char **drc_type, int *drc_power_domain) | 213 | char **drc_name, char **drc_type, int *drc_power_domain) |
214 | { | 214 | { |
215 | int *indexes, *names; | 215 | const int *indexes, *names; |
216 | int *types, *domains; | 216 | const int *types, *domains; |
217 | unsigned int *my_index; | 217 | const unsigned int *my_index; |
218 | char *name_tmp, *type_tmp; | 218 | char *name_tmp, *type_tmp; |
219 | int i, rc; | 219 | int i, rc; |
220 | 220 | ||
221 | my_index = (int *) get_property(dn, "ibm,my-drc-index", NULL); | 221 | my_index = get_property(dn, "ibm,my-drc-index", NULL); |
222 | if (!my_index) { | 222 | if (!my_index) { |
223 | /* Node isn't DLPAR/hotplug capable */ | 223 | /* Node isn't DLPAR/hotplug capable */ |
224 | return -EINVAL; | 224 | return -EINVAL; |
@@ -265,10 +265,10 @@ static int is_php_type(char *drc_type) | |||
265 | return 1; | 265 | return 1; |
266 | } | 266 | } |
267 | 267 | ||
268 | static int is_php_dn(struct device_node *dn, int **indexes, int **names, | 268 | static int is_php_dn(struct device_node *dn, const int **indexes, |
269 | int **types, int **power_domains) | 269 | const int **names, const int **types, const int **power_domains) |
270 | { | 270 | { |
271 | int *drc_types; | 271 | const int *drc_types; |
272 | int rc; | 272 | int rc; |
273 | 273 | ||
274 | rc = get_children_props(dn, indexes, names, &drc_types, power_domains); | 274 | rc = get_children_props(dn, indexes, names, &drc_types, power_domains); |
@@ -296,7 +296,7 @@ int rpaphp_add_slot(struct device_node *dn) | |||
296 | struct slot *slot; | 296 | struct slot *slot; |
297 | int retval = 0; | 297 | int retval = 0; |
298 | int i; | 298 | int i; |
299 | int *indexes, *names, *types, *power_domains; | 299 | const int *indexes, *names, *types, *power_domains; |
300 | char *name, *type; | 300 | char *name, *type; |
301 | 301 | ||
302 | dbg("Entry %s: dn->full_name=%s\n", __FUNCTION__, dn->full_name); | 302 | dbg("Entry %s: dn->full_name=%s\n", __FUNCTION__, dn->full_name); |