Merge v5.14-rc3 into usb-next

[linux-2.6-microblaze.git] / drivers / scsi / libsas / sas_discover.c

diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index 161c9b3..dd20541 100644 (file)
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -75,7 +75,7 @@ static int sas_get_port_device(struct asd_sas_port *port)
                struct dev_to_host_fis *fis =
                        (struct dev_to_host_fis *) dev->frame_rcvd;
                if (fis->interrupt_reason == 1 && fis->lbal == 1 &&
-                   fis->byte_count_low==0x69 && fis->byte_count_high == 0x96
+                   fis->byte_count_low == 0x69 && fis->byte_count_high == 0x96
                    && (fis->device & ~0x10) == 0)
                        dev->dev_type = SAS_SATA_PM;
                else
@@ -461,7 +461,7 @@ static void sas_discover_domain(struct work_struct *work)
                break;
 #else
                pr_notice("ATA device seen but CONFIG_SCSI_SAS_ATA=N so cannot attach\n");
-               /* Fall through */
+               fallthrough;
 #endif
                /* Fall through - only for the #else condition above. */
        default: