forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/scsi/isci/remote_device.c
....@@ -310,7 +310,7 @@
310310 /* Kill all outstanding requests for the device. */
311311 sci_remote_device_terminate_requests(idev);
312312
313
- /* Fall through into the default case... */
313
+ fallthrough; /* into the default case */
314314 default:
315315 clear_bit(IDEV_IO_READY, &idev->flags);
316316 break;
....@@ -593,7 +593,7 @@
593593
594594 break;
595595 }
596
- /* Else, fall through and treat as unhandled... */
596
+ fallthrough; /* and treat as unhandled */
597597 default:
598598 dev_dbg(scirdev_to_dev(idev),
599599 "%s: device: %p event code: %x: %s\n",
....@@ -1087,7 +1087,7 @@
10871087
10881088 if (dev->dev_type == SAS_SATA_DEV || (dev->tproto & SAS_PROTOCOL_SATA)) {
10891089 sci_change_state(&idev->sm, SCI_STP_DEV_IDLE);
1090
- } else if (dev_is_expander(dev)) {
1090
+ } else if (dev_is_expander(dev->dev_type)) {
10911091 sci_change_state(&idev->sm, SCI_SMP_DEV_IDLE);
10921092 } else
10931093 isci_remote_device_ready(ihost, idev);
....@@ -1478,7 +1478,7 @@
14781478 struct domain_device *dev = idev->domain_dev;
14791479 enum sci_status status;
14801480
1481
- if (dev->parent && dev_is_expander(dev->parent))
1481
+ if (dev->parent && dev_is_expander(dev->parent->dev_type))
14821482 status = sci_remote_device_ea_construct(iport, idev);
14831483 else
14841484 status = sci_remote_device_da_construct(iport, idev);
....@@ -1504,7 +1504,7 @@
15041504 * This function builds the isci_remote_device when a libsas dev_found message
15051505 * is received.
15061506 * @isci_host: This parameter specifies the isci host object.
1507
- * @port: This parameter specifies the isci_port conected to this device.
1507
+ * @port: This parameter specifies the isci_port connected to this device.
15081508 *
15091509 * pointer to new isci_remote_device.
15101510 */