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

diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c
index bc733f1e6e8d8be334a6c92877b2dd19578ddd4c..54de7f5eb1e8ecf3cc381d6452fc7d6943ca94ef 100644 (file)
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -300,7 +300,7 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
                goto out_region;
        }
 
-       host = scsi_register(&arxescsi_template, sizeof(struct arxescsi_info));
+       host = scsi_host_alloc(&arxescsi_template, sizeof(struct arxescsi_info));
        if (!host) {
                ret = -ENOMEM;
                goto out_unmap;
@@ -341,7 +341,7 @@ arxescsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 
        fas216_release(host);
  out_unregister:
-       scsi_unregister(host);
+       scsi_host_put(host);
  out_unmap:
        iounmap(base);
  out_region:
@@ -366,7 +366,7 @@ static void __devexit arxescsi_remove(struct expansion_card *ec)
        release_mem_region(resbase, reslen);
 
        fas216_release(host);
-       scsi_unregister(host);
+       scsi_host_put(host);
 }
 
 static const struct ecard_id arxescsi_cids[] = {

diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index 1266b23f345dbfec13b66ae4b864ec717597f9eb..89ffb31121d951d4658985f2f58ba9bb0ebf38ba 100644 (file)
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -422,8 +422,8 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
                goto out_region;
        }
 
-       host = scsi_register(&cumanascsi2_template,
-                            sizeof(struct cumanascsi2_info));
+       host = scsi_host_alloc(&cumanascsi2_template,
+                              sizeof(struct cumanascsi2_info));
        if (!host) {
                ret = -ENOMEM;
                goto out_unmap;
@@ -498,7 +498,7 @@ cumanascsi2_probe(struct expansion_card *ec, const struct ecard_id *id)
        fas216_release(host);
 
  out_free:
-       scsi_unregister(host);
+       scsi_host_put(host);
 
  out_unmap:
        iounmap(base);
@@ -531,7 +531,7 @@ static void __devexit cumanascsi2_remove(struct expansion_card *ec)
        release_mem_region(resbase, reslen);
 
        fas216_release(host);
-       scsi_unregister(host);
+       scsi_host_put(host);
 }
 
 static const struct ecard_id cumanascsi2_cids[] = {

diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index 443badac1d776008bd4a14e9f6a3f77ab946818f..de4819fe2bcf0a1fd64dc8c2f4cf5cb50f1a4e12 100644 (file)
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -529,8 +529,8 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
                goto out_region;
        }
 
-       host = scsi_register(&eesox_template,
-                            sizeof(struct eesoxscsi_info));
+       host = scsi_host_alloc(&eesox_template,
+                              sizeof(struct eesoxscsi_info));
        if (!host) {
                ret = -ENOMEM;
                goto out_unmap;
@@ -606,7 +606,7 @@ eesoxscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 
  out_free:
        device_remove_file(&ec->dev, &dev_attr_bus_term);
-       scsi_unregister(host);
+       scsi_host_put(host);
 
  out_unmap:
        iounmap(base);
@@ -641,7 +641,7 @@ static void __devexit eesoxscsi_remove(struct expansion_card *ec)
        release_mem_region(resbase, reslen);
 
        fas216_release(host);
-       scsi_unregister(host);
+       scsi_host_put(host);
 }
 
 static const struct ecard_id eesoxscsi_cids[] = {

diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c
index 1b26af707b872bf8fa3c210fcaf86491a4105434..e5dd354c406647925ab1ae81c10ca22bed23ed80 100644 (file)
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -332,8 +332,8 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
                goto out_region;
        }
 
-       host = scsi_register(&powertecscsi_template,
-                            sizeof (struct powertec_info));
+       host = scsi_host_alloc(&powertecscsi_template,
+                              sizeof (struct powertec_info));
        if (!host) {
                ret = -ENOMEM;
                goto out_unmap;
@@ -407,7 +407,7 @@ powertecscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
 
  out_free:
        device_remove_file(&ec->dev, &dev_attr_bus_term);
-       scsi_unregister(host);
+       scsi_host_put(host);
 
  out_unmap:
        iounmap(base);
@@ -442,7 +442,7 @@ static void __devexit powertecscsi_remove(struct expansion_card *ec)
        release_mem_region(resbase, reslen);
 
        fas216_release(host);
-       scsi_unregister(host);
+       scsi_host_put(host);
 }
 
 static const struct ecard_id powertecscsi_cids[] = {