change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/scsi/ppa.c
..
..
@@ -590,7 +590,7 @@
590
590
 		if (cmd->SCp.buffer && !cmd->SCp.this_residual) {
591
591
 			/* if scatter/gather, advance to the next segment */
592
592
 			if (cmd->SCp.buffers_residual--) {
593
-				cmd->SCp.buffer++;
593
+				cmd->SCp.buffer = sg_next(cmd->SCp.buffer);
594
594
 				cmd->SCp.this_residual =
595
595
 				    cmd->SCp.buffer->length;
596
596
 				cmd->SCp.ptr = sg_virt(cmd->SCp.buffer);
..
..
@@ -717,6 +717,7 @@
717
717
 			}
718
718
 			cmd->SCp.phase++;
719
719
 		}
720
+		fallthrough;
720
721
 
721
722
 	case 2:		/* Phase 2 - We are now talking to the scsi bus */
722
723
 		if (!ppa_select(dev, scmd_id(cmd))) {
..
..
@@ -724,7 +725,7 @@
724
725
 			return 0;
725
726
 		}
726
727
 		cmd->SCp.phase++;
727
-		/* fall through */
728
+		fallthrough;
728
729
 
729
730
 	case 3:		/* Phase 3 - Ready to accept a command */
730
731
 		w_ctr(ppb, 0x0c);
..
..
@@ -734,7 +735,7 @@
734
735
 		if (!ppa_send_command(cmd))
735
736
 			return 0;
736
737
 		cmd->SCp.phase++;
737
-		/* fall through */
738
+		fallthrough;
738
739
 
739
740
 	case 4:		/* Phase 4 - Setup scatter/gather buffers */
740
741
 		if (scsi_bufflen(cmd)) {
..
..
@@ -748,7 +749,7 @@
748
749
 		}
749
750
 		cmd->SCp.buffers_residual = scsi_sg_count(cmd) - 1;
750
751
 		cmd->SCp.phase++;
751
-		/* fall through */
752
+		fallthrough;
752
753
 
753
754
 	case 5:		/* Phase 5 - Data transfer stage */
754
755
 		w_ctr(ppb, 0x0c);
..
..
@@ -761,7 +762,7 @@
761
762
 		if (retv == 0)
762
763
 			return 1;
763
764
 		cmd->SCp.phase++;
764
-		/* fall through */
765
+		fallthrough;
765
766
 
766
767
 	case 6:		/* Phase 6 - Read status/message */
767
768
 		cmd->result = DID_OK << 16;
..
..
@@ -778,7 +779,6 @@
778
779
 			    (DID_OK << 16) + (h << 8) + (l & STATUS_MASK);
779
780
 		}
780
781
 		return 0;	/* Finished */
781
-		break;
782
782
 
783
783
 	default:
784
784
 		printk(KERN_ERR "ppa: Invalid scsi phase\n");
..
..
@@ -846,10 +846,8 @@
846
846
 	case 1:		/* Have not connected to interface */
847
847
 		dev->cur_cmd = NULL;	/* Forget the problem */
848
848
 		return SUCCESS;
849
-		break;
850
849
 	default:		/* SCSI command sent, can not abort */
851
850
 		return FAILED;
852
-		break;
853
851
 	}
854
852
 }
855
853
 
..
..
@@ -978,7 +976,6 @@
978
976
 	.bios_param		= ppa_biosparam,
979
977
 	.this_id		= -1,
980
978
 	.sg_tablesize		= SG_ALL,
981
-	.use_clustering		= ENABLE_CLUSTERING,
982
979
 	.can_queue		= 1,
983
980
 	.slave_alloc		= ppa_adjust_queue,
984
981
 };