Merge branch 'pwm-dmtimer-fixes' into omap-for-v5.0/fixes-v2

[linux-2.6-microblaze.git] / drivers / scsi / xen-scsifront.c

diff --git a/drivers/scsi/xen-scsifront.c b/drivers/scsi/xen-scsifront.c
index 61389bd..f0068e9 100644 (file)
--- a/drivers/scsi/xen-scsifront.c
+++ b/drivers/scsi/xen-scsifront.c
@@ -696,7 +696,6 @@ static struct scsi_host_template scsifront_sht = {
        .this_id                = -1,
        .cmd_size               = sizeof(struct vscsifrnt_shadow),
        .sg_tablesize           = VSCSIIF_SG_TABLESIZE,
-       .use_clustering         = DISABLE_CLUSTERING,
        .proc_name              = "scsifront",
 };
 
@@ -1112,7 +1111,7 @@ static void scsifront_backend_changed(struct xenbus_device *dev,
        case XenbusStateClosed:
                if (dev->state == XenbusStateClosed)
                        break;
-               /* Missed the backend's Closing state -- fallthrough */
+               /* fall through - Missed the backend's Closing state */
        case XenbusStateClosing:
                scsifront_disconnect(info);
                break;