diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-04-23 23:50:55 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-24 08:08:59 -0400 |
commit | 8c8dc322486d5394dc981bef9276dd0ce6c8d1ce (patch) | |
tree | 2275c19196414da08a3834c4b56a1da72e1e3715 /drivers | |
parent | 112466b4d0036b3244509d01dbbf3c8caec52a23 (diff) |
[POWERPC] Remove old interface find_path_device
Replaced by of_find_node_by_path.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/briq_panel.c | 7 | ||||
-rw-r--r-- | drivers/scsi/ibmvscsi/ibmvstgt.c | 3 | ||||
-rw-r--r-- | drivers/scsi/ibmvscsi/rpa_vscsi.c | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c index 669965a461f9..ed53f541d9e8 100644 --- a/drivers/char/briq_panel.c +++ b/drivers/char/briq_panel.c | |||
@@ -202,13 +202,16 @@ static struct miscdevice briq_panel_miscdev = { | |||
202 | 202 | ||
203 | static int __init briq_panel_init(void) | 203 | static int __init briq_panel_init(void) |
204 | { | 204 | { |
205 | struct device_node *root = find_path_device("/"); | 205 | struct device_node *root = of_find_node_by_path("/"); |
206 | const char *machine; | 206 | const char *machine; |
207 | int i; | 207 | int i; |
208 | 208 | ||
209 | machine = of_get_property(root, "model", NULL); | 209 | machine = of_get_property(root, "model", NULL); |
210 | if (!machine || strncmp(machine, "TotalImpact,BRIQ-1", 18) != 0) | 210 | if (!machine || strncmp(machine, "TotalImpact,BRIQ-1", 18) != 0) { |
211 | of_node_put(root); | ||
211 | return -ENODEV; | 212 | return -ENODEV; |
213 | } | ||
214 | of_node_put(root); | ||
212 | 215 | ||
213 | printk(KERN_INFO | 216 | printk(KERN_INFO |
214 | "briq_panel: v%s Dr. Karsten Jeppesen (kj@totalimpact.com)\n", | 217 | "briq_panel: v%s Dr. Karsten Jeppesen (kj@totalimpact.com)\n", |
diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c index 3fe831cdb74e..140dd9700ff6 100644 --- a/drivers/scsi/ibmvscsi/ibmvstgt.c +++ b/drivers/scsi/ibmvscsi/ibmvstgt.c | |||
@@ -899,7 +899,7 @@ static int get_system_info(void) | |||
899 | const char *id, *model, *name; | 899 | const char *id, *model, *name; |
900 | const unsigned int *num; | 900 | const unsigned int *num; |
901 | 901 | ||
902 | rootdn = find_path_device("/"); | 902 | rootdn = of_find_node_by_path("/"); |
903 | if (!rootdn) | 903 | if (!rootdn) |
904 | return -ENOENT; | 904 | return -ENOENT; |
905 | 905 | ||
@@ -916,6 +916,7 @@ static int get_system_info(void) | |||
916 | if (num) | 916 | if (num) |
917 | partition_number = *num; | 917 | partition_number = *num; |
918 | 918 | ||
919 | of_node_put(rootdn); | ||
919 | return 0; | 920 | return 0; |
920 | } | 921 | } |
921 | 922 | ||
diff --git a/drivers/scsi/ibmvscsi/rpa_vscsi.c b/drivers/scsi/ibmvscsi/rpa_vscsi.c index 9bbb69ca73ee..d8700aaa6114 100644 --- a/drivers/scsi/ibmvscsi/rpa_vscsi.c +++ b/drivers/scsi/ibmvscsi/rpa_vscsi.c | |||
@@ -157,7 +157,7 @@ static void gather_partition_info(void) | |||
157 | const unsigned int *p_number_ptr; | 157 | const unsigned int *p_number_ptr; |
158 | 158 | ||
159 | /* Retrieve information about this partition */ | 159 | /* Retrieve information about this partition */ |
160 | rootdn = find_path_device("/"); | 160 | rootdn = of_find_node_by_path("/"); |
161 | if (!rootdn) { | 161 | if (!rootdn) { |
162 | return; | 162 | return; |
163 | } | 163 | } |
@@ -169,6 +169,7 @@ static void gather_partition_info(void) | |||
169 | p_number_ptr = of_get_property(rootdn, "ibm,partition-no", NULL); | 169 | p_number_ptr = of_get_property(rootdn, "ibm,partition-no", NULL); |
170 | if (p_number_ptr) | 170 | if (p_number_ptr) |
171 | partition_number = *p_number_ptr; | 171 | partition_number = *p_number_ptr; |
172 | of_node_put(rootdn); | ||
172 | } | 173 | } |
173 | 174 | ||
174 | static void set_adapter_info(struct ibmvscsi_host_data *hostdata) | 175 | static void set_adapter_info(struct ibmvscsi_host_data *hostdata) |