Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   John Garry <john.g.garry@oracle.com>
To:     jejb@linux.ibm.com, martin.petersen@oracle.com,
        dgilbert@interlog.com
Cc:     linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH] scsi: scsi_debug: Delete unreachable code in inquiry_vpd_b0()
Date:   Tue, 13 Dec 2022 14:21:22 +0000
Message-Id: <20221213142122.1011886-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YzzQH0Th292cNRrWmMppQ1MDdP9AcYiG5Cf7xqKdP0myLcZhhyVisNqusO+w?=
 =?us-ascii?Q?ff5O9fh8InH1G+OisrPR6uTKh6D1aSOwEd/p1io9kEQ+3VCZ6gGTil5dVpwn?=
 =?us-ascii?Q?QmTsD1etosRi+q4eYEwvoZ3mzLFpMq2Eu5+4UbIsNFb9oMHRo9zNS8cd+mm6?=
 =?us-ascii?Q?asTrt6sPVq5NM4XJnlK+ZeIap4AqJV38zgD0BtrMbJm6+xKrs3uxy0r5O/DT?=
 =?us-ascii?Q?LG3kC02NI1Vw0SWki4bnbDpk7CPHwO5sot/M4j4uhdO7m1K5Tj/Bo41+RNG5?=
 =?us-ascii?Q?dc4bDs2VRnjAQYgUOZfPhJXtIMRvAVAkGqiCqljOfHLHDiZ1PUAKAd2+Whyp?=
 =?us-ascii?Q?iMDihAleAgQzitqv/oTQ1+wk1SpPOJ0GKkkrlk9Zt2HhNrtOOGPUHyJjdWY/?=
 =?us-ascii?Q?y6e0rzOH/IA1I68JEM9LvCfU1qo72Z05ilH0WywR0NtoMz8lUV0GnUbNo71b?=
 =?us-ascii?Q?3KdPY3dGpZfD7lN6+bf9onfpq20I53f3GbOTNic6woq714lEKvpVR85UeuwE?=
 =?us-ascii?Q?vD54pqjqoEA1JXvl/kPgvopIc15YejIU1xnzNj7miv6EihgFMUwdF8Ded7gd?=
 =?us-ascii?Q?P0iMzmDucyajU7qvHOivW9Y1ccGA8D9lCLVLStgEP3t7Q13CkTjtF8SSFTI7?=
 =?us-ascii?Q?TueX5Ucgl/6lhGTNv+L4IB3YtpIdrIQGh9q3GKK9luHkMs4/cAeVQEbF9WI/?=
 =?us-ascii?Q?ln8g5FDtO2JWHeIPOKEMB7arBYTlxhKe7KE+O91kLWa4RfWU2mJfNsSrSMf2?=
 =?us-ascii?Q?sQHPxLotWCZ6zYwnchgrZM/gWTYA/f99++fFgfLWqGiSt+tosDfuOgv21Y43?=
 =?us-ascii?Q?EUDlG2YJF4tWMPyRcvabjZ9lKbd52EWw+m3A3AR4X0hnMufN2v4pmI/MXsx0?=
 =?us-ascii?Q?xZpTWTHcNeGeZq00mipymXRWJBt3ddVLEksjPMbxKhgibqoxN3l7Cl/l9cTd?=
 =?us-ascii?Q?3KpfmbM6KFZzVnPQf2x1DnGnAJDL21EWkOygT4KSvzBBK6nqm8t6Hvcl94+Z?=
 =?us-ascii?Q?fHg2PPaL9nGth0hjupwCSTecq3lHjb3r0d9q/Rs4ZTnP5fJdEojrTE1k0Yg+?=
 =?us-ascii?Q?lBXlRcTmItXHB+sFRrNmQu/jnjWL2zab9hD8x8SF3YrHbU1Y1rxKlZ2gHAKJ?=
 =?us-ascii?Q?L+tYpeR+ArybCyErzo1pDH+m4f7ELlOHGkLpAoKABbnCG2nHgeXEn7BHx3fp?=
 =?us-ascii?Q?4giM/gX/cem0K4qJ94W3NR8kVzuwPwLiUrxe6NsExvcBvztp/NYNL3Hw4DOh?=
 =?us-ascii?Q?kEclv6j3wdETFMN9Hm7jCNEj6jMPETpNWdcef/+K5X8D7ro2HeVEW68O3He1?=
 =?us-ascii?Q?eu4T+rYDTMGdZyY240BUZ/gAU2O7Qkhvo8rSKtQVxExjwdsQg/nCuMR19D7d?=
 =?us-ascii?Q?u+35n2F8ZNBo5ey+zAgNAcP+AfdD+329OnCqZ+dmUnljQTe8DHhryMvt2k+s?=
 =?us-ascii?Q?UygjqUpDJZtBV5PegvSn5GUzMbsqJkmr/SVfejDdcihV91P6XWvpZdse2h1+?=
 =?us-ascii?Q?vOWVCyhcCqKZqn71PalG4ld9J2sm6MTx177FFfRryLQVXBa3DsnHvCZi2N0/?=
 =?us-ascii?Q?thXngbFEQHmYOccmSyIOEyRzKCXvKkKKbxTVGmTzxaaa3AORWSAgDOPYcbk0?=
 =?us-ascii?Q?YA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 81b51229-2559-4d32-d94a-08dadd15578f
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2022 14:21:36.0224
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 3KiS2Zk9bQG8HgonZKX1qbv6BOz0rRitA7R2FF7nMQxOFO4LYHTgxQcbKw8DDA9mXtmkF5P7AnIScJqeyAiMAw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4141
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-12-13_03,2022-12-13_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0
 mlxlogscore=999 adultscore=0 malwarescore=0 phishscore=0 bulkscore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2210170000 definitions=main-2212130127
X-Proofpoint-GUID: u6leWyS-c73EkImH32QSeXx4PdZzQbOY
X-Proofpoint-ORIG-GUID: u6leWyS-c73EkImH32QSeXx4PdZzQbOY
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The 2nd return statement in inquiry_vpd_b0() is unreachable, so delete it.

Signed-off-by: John Garry <john.g.garry@oracle.com>

diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index b8a76b89f85a..6f637501539c 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -1511,8 +1511,6 @@ static int inquiry_vpd_b0(unsigned char *arr)
 	put_unaligned_be64(sdebug_write_same_length, &arr[32]);
 
 	return 0x3c; /* Mandatory page length for Logical Block Provisioning */
-
-	return sizeof(vpdb0_data);
 }
 
 /* Block device characteristics VPD page (SBC-3) */
-- 
2.35.3