Commit 5d016022 authored by Russell King's avatar Russell King

[ARM] Use scsi_host_{alloc,put}() rather than scsi_{un,}register()

parent ad83f139
...@@ -300,7 +300,7 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -300,7 +300,7 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
goto out_region; goto out_region;
} }
host = scsi_register(&arxescsi_template, sizeof(struct arxescsi_info)); host = scsi_host_alloc(&arxescsi_template, sizeof(struct arxescsi_info));
if (!host) { if (!host) {
ret = -ENOMEM; ret = -ENOMEM;
goto out_unmap; goto out_unmap;
...@@ -341,7 +341,7 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -341,7 +341,7 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
fas216_release(host); fas216_release(host);
out_unregister: out_unregister:
scsi_unregister(host); scsi_host_put(host);
out_unmap: out_unmap:
iounmap(base); iounmap(base);
out_region: out_region:
...@@ -366,7 +366,7 @@ static void __devexit arxescsi_remove(struct expansion_card *ec) ...@@ -366,7 +366,7 @@ static void __devexit arxescsi_remove(struct expansion_card *ec)
release_mem_region(resbase, reslen); release_mem_region(resbase, reslen);
fas216_release(host); fas216_release(host);
scsi_unregister(host); scsi_host_put(host);
} }
static const struct ecard_id arxescsi_cids[] = { static const struct ecard_id arxescsi_cids[] = {
......
...@@ -422,8 +422,8 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -422,8 +422,8 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
goto out_region; goto out_region;
} }
host = scsi_register(&cumanascsi2_template, host = scsi_host_alloc(&cumanascsi2_template,
sizeof(struct cumanascsi2_info)); sizeof(struct cumanascsi2_info));
if (!host) { if (!host) {
ret = -ENOMEM; ret = -ENOMEM;
goto out_unmap; goto out_unmap;
...@@ -498,7 +498,7 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -498,7 +498,7 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
fas216_release(host); fas216_release(host);
out_free: out_free:
scsi_unregister(host); scsi_host_put(host);
out_unmap: out_unmap:
iounmap(base); iounmap(base);
...@@ -531,7 +531,7 @@ static void __devexit cumanascsi2_remove(struct expansion_card *ec) ...@@ -531,7 +531,7 @@ static void __devexit cumanascsi2_remove(struct expansion_card *ec)
release_mem_region(resbase, reslen); release_mem_region(resbase, reslen);
fas216_release(host); fas216_release(host);
scsi_unregister(host); scsi_host_put(host);
} }
static const struct ecard_id cumanascsi2_cids[] = { static const struct ecard_id cumanascsi2_cids[] = {
......
...@@ -529,8 +529,8 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -529,8 +529,8 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
goto out_region; goto out_region;
} }
host = scsi_register(&eesox_template, host = scsi_host_alloc(&eesox_template,
sizeof(struct eesoxscsi_info)); sizeof(struct eesoxscsi_info));
if (!host) { if (!host) {
ret = -ENOMEM; ret = -ENOMEM;
goto out_unmap; goto out_unmap;
...@@ -606,7 +606,7 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -606,7 +606,7 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
out_free: out_free:
device_remove_file(&ec->dev, &dev_attr_bus_term); device_remove_file(&ec->dev, &dev_attr_bus_term);
scsi_unregister(host); scsi_host_put(host);
out_unmap: out_unmap:
iounmap(base); iounmap(base);
...@@ -641,7 +641,7 @@ static void __devexit eesoxscsi_remove(struct expansion_card *ec) ...@@ -641,7 +641,7 @@ static void __devexit eesoxscsi_remove(struct expansion_card *ec)
release_mem_region(resbase, reslen); release_mem_region(resbase, reslen);
fas216_release(host); fas216_release(host);
scsi_unregister(host); scsi_host_put(host);
} }
static const struct ecard_id eesoxscsi_cids[] = { static const struct ecard_id eesoxscsi_cids[] = {
......
...@@ -332,8 +332,8 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -332,8 +332,8 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
goto out_region; goto out_region;
} }
host = scsi_register(&powertecscsi_template, host = scsi_host_alloc(&powertecscsi_template,
sizeof (struct powertec_info)); sizeof (struct powertec_info));
if (!host) { if (!host) {
ret = -ENOMEM; ret = -ENOMEM;
goto out_unmap; goto out_unmap;
...@@ -407,7 +407,7 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id) ...@@ -407,7 +407,7 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
out_free: out_free:
device_remove_file(&ec->dev, &dev_attr_bus_term); device_remove_file(&ec->dev, &dev_attr_bus_term);
scsi_unregister(host); scsi_host_put(host);
out_unmap: out_unmap:
iounmap(base); iounmap(base);
...@@ -442,7 +442,7 @@ static void __devexit powertecscsi_remove(struct expansion_card *ec) ...@@ -442,7 +442,7 @@ static void __devexit powertecscsi_remove(struct expansion_card *ec)
release_mem_region(resbase, reslen); release_mem_region(resbase, reslen);
fas216_release(host); fas216_release(host);
scsi_unregister(host); scsi_host_put(host);
} }
static const struct ecard_id powertecscsi_cids[] = { static const struct ecard_id powertecscsi_cids[] = {
......
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