scsi: libsas: aic94xx: hisi_sas: mvsas: pm8001: Use dev_is_expander()

Many times in libsas, and in LLDDs which use libsas, the check for an
expander device is re-implemented or open coded.

Use dev_is_expander() instead. We rename this from
sas_dev_type_is_expander() to not spill so many lines in referencing.

Signed-off-by: John Garry <john.garry@huawei.com>
Reviewed-by: Jason Yan <yanaijie@huawei.com>
Reviewed-by: Jack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

3 files changed, 15 insertions, 25 deletions

diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index 2518cecb7edf..abcad097ff2f 100644
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -293,7 +293,7 @@ void sas_free_device(struct kref *kref)
         dev->phy = NULL;
 
         /* remove the phys and ports, everything else should be gone */
-        if (dev->dev_type == SAS_EDGE_EXPANDER_DEVICE || dev->dev_type == SAS_FANOUT_EXPANDER_DEVICE)
+        if (dev_is_expander(dev->dev_type))
                 kfree(dev->ex_dev.ex_phy);
 
         if (dev_is_sata(dev) && dev->sata_dev.ap) {
@@ -503,8 +503,7 @@ static void sas_revalidate_domain(struct work_struct *work)
         pr_debug("REVALIDATING DOMAIN on port %d, pid:%d\n", port->id,
                  task_pid_nr(current));
 
-        if (ddev && (ddev->dev_type == SAS_FANOUT_EXPANDER_DEVICE ||
-                     ddev->dev_type == SAS_EDGE_EXPANDER_DEVICE))
+        if (ddev && dev_is_expander(ddev->dev_type))
                 res = sas_ex_revalidate_domain(ddev);
 
         pr_debug("done REVALIDATING DOMAIN on port %d, pid:%d, res 0x%x\n",
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index fd16a3debef4..ecae55f117a3 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -1120,8 +1120,7 @@ static int sas_find_sub_addr(struct domain_device *dev, u8 *sub_addr)
                     phy->phy_state == PHY_NOT_PRESENT)
                         continue;
 
-                if ((phy->attached_dev_type == SAS_EDGE_EXPANDER_DEVICE ||
-                     phy->attached_dev_type == SAS_FANOUT_EXPANDER_DEVICE) &&
+                if (dev_is_expander(phy->attached_dev_type) &&
                     phy->routing_attr == SUBTRACTIVE_ROUTING) {
 
                         memcpy(sub_addr, phy->attached_sas_addr, SAS_ADDR_SIZE);
@@ -1139,8 +1138,7 @@ static int sas_check_level_subtractive_boundary(struct domain_device *dev)
         u8 sub_addr[SAS_ADDR_SIZE] = {0, };
 
         list_for_each_entry(child, &ex->children, siblings) {
-                if (child->dev_type != SAS_EDGE_EXPANDER_DEVICE &&
-                    child->dev_type != SAS_FANOUT_EXPANDER_DEVICE)
+                if (!dev_is_expander(child->dev_type))
                         continue;
                 if (sub_addr[0] == 0) {
                         sas_find_sub_addr(child, sub_addr);
@@ -1225,8 +1223,7 @@ static int sas_check_ex_subtractive_boundary(struct domain_device *dev)
                     phy->phy_state == PHY_NOT_PRESENT)
                         continue;
 
-                if ((phy->attached_dev_type == SAS_FANOUT_EXPANDER_DEVICE ||
-                     phy->attached_dev_type == SAS_EDGE_EXPANDER_DEVICE) &&
+                if (dev_is_expander(phy->attached_dev_type) &&
                     phy->routing_attr == SUBTRACTIVE_ROUTING) {
 
                         if (!sub_sas_addr)
@@ -1322,8 +1319,7 @@ static int sas_check_parent_topology(struct domain_device *child)
         if (!child->parent)
                 return 0;
 
-        if (child->parent->dev_type != SAS_EDGE_EXPANDER_DEVICE &&
-            child->parent->dev_type != SAS_FANOUT_EXPANDER_DEVICE)
+        if (!dev_is_expander(child->parent->dev_type))
                 return 0;
 
         parent_ex = &child->parent->ex_dev;
@@ -1619,8 +1615,7 @@ static int sas_ex_level_discovery(struct asd_sas_port *port, const int level)
         struct domain_device *dev;
 
         list_for_each_entry(dev, &port->dev_list, dev_list_node) {
-                if (dev->dev_type == SAS_EDGE_EXPANDER_DEVICE ||
-                    dev->dev_type == SAS_FANOUT_EXPANDER_DEVICE) {
+                if (dev_is_expander(dev->dev_type)) {
                         struct sas_expander_device *ex =
                                 rphy_to_expander_device(dev->rphy);
 
@@ -1852,7 +1847,7 @@ static int sas_find_bcast_dev(struct domain_device *dev,
                                 SAS_ADDR(dev->sas_addr));
         }
         list_for_each_entry(ch, &ex->children, siblings) {
-                if (ch->dev_type == SAS_EDGE_EXPANDER_DEVICE || ch->dev_type == SAS_FANOUT_EXPANDER_DEVICE) {
+                if (dev_is_expander(ch->dev_type)) {
                         res = sas_find_bcast_dev(ch, src_dev);
                         if (*src_dev)
                                 return res;
@@ -1869,8 +1864,7 @@ static void sas_unregister_ex_tree(struct asd_sas_port *port, struct domain_devi
 
         list_for_each_entry_safe(child, n, &ex->children, siblings) {
                 set_bit(SAS_DEV_GONE, &child->state);
-                if (child->dev_type == SAS_EDGE_EXPANDER_DEVICE ||
-                    child->dev_type == SAS_FANOUT_EXPANDER_DEVICE)
+                if (dev_is_expander(child->dev_type))
                         sas_unregister_ex_tree(port, child);
                 else
                         sas_unregister_dev(port, child);
@@ -1890,8 +1884,7 @@ static void sas_unregister_devs_sas_addr(struct domain_device *parent,
                         if (SAS_ADDR(child->sas_addr) ==
                             SAS_ADDR(phy->attached_sas_addr)) {
                                 set_bit(SAS_DEV_GONE, &child->state);
-                                if (child->dev_type == SAS_EDGE_EXPANDER_DEVICE ||
-                                    child->dev_type == SAS_FANOUT_EXPANDER_DEVICE)
+                                if (dev_is_expander(child->dev_type))
                                         sas_unregister_ex_tree(parent->port, child);
                                 else
                                         sas_unregister_dev(parent->port, child);
@@ -1920,8 +1913,7 @@ static int sas_discover_bfs_by_root_level(struct domain_device *root,
         int res = 0;
 
         list_for_each_entry(child, &ex_root->children, siblings) {
-                if (child->dev_type == SAS_EDGE_EXPANDER_DEVICE ||
-                    child->dev_type == SAS_FANOUT_EXPANDER_DEVICE) {
+                if (dev_is_expander(child->dev_type)) {
                         struct sas_expander_device *ex =
                                 rphy_to_expander_device(child->rphy);
 
@@ -1974,8 +1966,7 @@ static int sas_discover_new(struct domain_device *dev, int phy_id)
         list_for_each_entry(child, &dev->ex_dev.children, siblings) {
                 if (SAS_ADDR(child->sas_addr) ==
                     SAS_ADDR(ex_phy->attached_sas_addr)) {
-                        if (child->dev_type == SAS_EDGE_EXPANDER_DEVICE ||
-                            child->dev_type == SAS_FANOUT_EXPANDER_DEVICE)
+                        if (dev_is_expander(child->dev_type))
                                 res = sas_discover_bfs_by_root(child);
                         break;
                 }
diff --git a/drivers/scsi/libsas/sas_port.c b/drivers/scsi/libsas/sas_port.c
index 11f028a441dd..7c86fd248129 100644
--- a/drivers/scsi/libsas/sas_port.c
+++ b/drivers/scsi/libsas/sas_port.c
@@ -54,7 +54,7 @@ static void sas_resume_port(struct asd_sas_phy *phy)
                         continue;
                 }
 
-                if (dev->dev_type == SAS_EDGE_EXPANDER_DEVICE || dev->dev_type == SAS_FANOUT_EXPANDER_DEVICE) {
+                if (dev_is_expander(dev->dev_type)) {
                         dev->ex_dev.ex_change_count = -1;
                         for (i = 0; i < dev->ex_dev.num_phys; i++) {
                                 struct ex_phy *phy = &dev->ex_dev.ex_phy[i];
@@ -179,7 +179,7 @@ static void sas_form_port(struct asd_sas_phy *phy)
 
         sas_discover_event(phy->port, DISCE_DISCOVER_DOMAIN);
         /* Only insert a revalidate event after initial discovery */
-        if (port_dev && sas_dev_type_is_expander(port_dev->dev_type)) {
+        if (port_dev && dev_is_expander(port_dev->dev_type)) {
                 struct expander_device *ex_dev = &port_dev->ex_dev;
 
                 ex_dev->ex_change_count = -1;
@@ -248,7 +248,7 @@ void sas_deform_port(struct asd_sas_phy *phy, int gone)
         spin_unlock_irqrestore(&sas_ha->phy_port_lock, flags);
 
         /* Only insert revalidate event if the port still has members */
-        if (port->port && dev && sas_dev_type_is_expander(dev->dev_type)) {
+        if (port->port && dev && dev_is_expander(dev->dev_type)) {
                 struct expander_device *ex_dev = &dev->ex_dev;
 
                 ex_dev->ex_change_count = -1;