ata: libata-transport: remove static variable ata_scsi_transport_template

Simplify the code by making struct ata_scsi_transportt public, instead
of using separate variable ata_scsi_transport_template.

Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Niklas Cassel <cassel@kernel.org>

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 06f3a243f037d903736fcb13ee6ab3ce0ee718f2..b15830bedd3a9e730f4bfe50e44695223adaf975 100644 (file)
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -4624,7 +4624,7 @@ int ata_scsi_add_hosts(struct ata_host *host, const struct scsi_host_template *s
                *(struct ata_port **)&shost->hostdata[0] = ap;
                ap->scsi_host = shost;
 
-               shost->transportt = ata_scsi_transport_template;
+               shost->transportt = &ata_scsi_transportt;
                shost->unique_id = ap->print_id;
                shost->max_id = 16;
                shost->max_lun = 1;

diff --git a/drivers/ata/libata-transport.c b/drivers/ata/libata-transport.c
index c8db6e1b94109f7eaf6048bc07da56cf21e86517..95862dc34419214623198de8ab2d5ef7c2d9e12a 100644 (file)
--- a/drivers/ata/libata-transport.c
+++ b/drivers/ata/libata-transport.c
@@ -37,9 +37,6 @@
 #include "libata.h"
 #include "libata-transport.h"
 
-struct scsi_transport_template;
-struct scsi_transport_template *ata_scsi_transport_template;
-
 static int ata_tlink_match(struct attribute_container *cont,
                           struct device *dev);
 static int ata_tdev_match(struct attribute_container *cont,
@@ -224,7 +221,7 @@ static int ata_tport_match(struct attribute_container *cont,
 {
        if (!ata_is_port(dev))
                return 0;
-       return &ata_scsi_transport_template->host_attrs.ac == cont;
+       return &ata_scsi_transportt.host_attrs.ac == cont;
 }
 
 /**
@@ -722,7 +719,7 @@ int ata_tlink_add(struct ata_link *link)
        return error;
 }
 
-static struct scsi_transport_template ata_scsi_transportt = {
+struct scsi_transport_template ata_scsi_transportt = {
        .eh_strategy_handler    = ata_scsi_error,
        .user_scan              = ata_scsi_user_scan,
 
@@ -783,8 +780,6 @@ __init int libata_transport_init(void)
        transport_container_register(&ata_link_attr_cont);
        transport_container_register(&ata_dev_attr_cont);
 
-       ata_scsi_transport_template = &ata_scsi_transportt;
-
        return 0;
 
  out_unregister_port:

diff --git a/drivers/ata/libata-transport.h b/drivers/ata/libata-transport.h
index fe5ca66fc33ad32b49a049ac24f748bd8fd8eeee..629ac843a8738ac14f41006b129613cf1ffa4f51 100644 (file)
--- a/drivers/ata/libata-transport.h
+++ b/drivers/ata/libata-transport.h
@@ -3,7 +3,7 @@
 #define _LIBATA_TRANSPORT_H
 
 
-extern struct scsi_transport_template *ata_scsi_transport_template;
+extern struct scsi_transport_template ata_scsi_transportt;
 
 int ata_tlink_add(struct ata_link *link);
 void ata_tlink_delete(struct ata_link *link);