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,
        chenxiang66@hisilicon.com, artur.paszkiewicz@intel.com,
        yanaijie@huawei.com, jinpu.wang@cloud.ionos.com
Cc:     linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
        dlemoal@kernel.org, John Garry <john.g.garry@oracle.com>
Subject: [PATCH 09/10] scsi: libsas: Delete sas_ata_task.stp_affil_pol
Date:   Mon, 14 Aug 2023 14:10:21 +0000
Message-Id: <20230814141022.36875-10-john.g.garry@oracle.com>
In-Reply-To: <20230814141022.36875-1-john.g.garry@oracle.com>
References: <20230814141022.36875-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?MCQB24MKQrWDBLOEU2eFUdE7poKOBNSGzwSh2SiccpShqQVCezNSo5+OPQUe?=
 =?us-ascii?Q?UK8LTA1pL5/xRmN9pCnwF2DTQLOc2bhMFRldEdNqz2PItlgjpyvBX/1f2ztU?=
 =?us-ascii?Q?sMOgndYJ3PhCxvbxPm0/GbgHo4yVZMFxdQU1DD2CtdIna4hwdpK2Dq17KZ6r?=
 =?us-ascii?Q?RUVJ06SbTq3HGPy7LA6z6Zqb8G7f0fTwB3lfn4CMh0LAan1BNUUXHVplfav9?=
 =?us-ascii?Q?TujFvAafTIWURCRtiQ2kKDAkkVwJmSG44YiZxElj/7ZWLs3SCw+BelO7eVLA?=
 =?us-ascii?Q?RpooA0qkfJAKNBAoofS1H5c8krax9lY+9AgKk5cpClIGyvfie4VtCDYztOLW?=
 =?us-ascii?Q?N1VmuOGXAgWSN5XY5UranSsmcCzOEYAbV4+QJjgs0zItIEd4msJbN8ZB8TtE?=
 =?us-ascii?Q?M8UkVM5XhU1jpMJJo5cjelVSxgvmQ8r4ALPSpNAqQHI6O2IWgkymtFoH9bTt?=
 =?us-ascii?Q?c/I5VxLyU1X1Fm2YikHCcy5tv7CyQUikx0jraVZdwLarC116DknOU6pZcsw8?=
 =?us-ascii?Q?9UYiNlqznEHyTb3gUjMg3YZbfNlVY0l92R8/7djVX5l6K+kDW/qOxt6KPH1u?=
 =?us-ascii?Q?fPjgNipMP3FXN6lKjNAqSUDGMGuqWj0MHBcWknfBDAbFq8klcjYe8+RAj5VW?=
 =?us-ascii?Q?ZC+qS6JaMhBWyJmsiitVuCYjZtyEkEloAbKF5pJdde6gBR5PZQUTpduIL0hs?=
 =?us-ascii?Q?L5mAWiWnUbLnvhRf74Amo6m3WDelWhSiN3JKHbnvoy6qG/vOMa2RhjXS0dVC?=
 =?us-ascii?Q?LGZ+MyrInh/e2Q7XxdOiCUkG7jLFhXFmJnVJUwgqvvYfdRvOM8UlzPGGXXfw?=
 =?us-ascii?Q?j1PPDT9QakgHzFlsgiuYi08uZ3HJzjpV11VvCCTSnSV5AvIK7Ux5kHo0EGqN?=
 =?us-ascii?Q?cRUtEC7JVW7GpDRDunNLTPkMmP8hjYoccY9WjW4o6rLercZY8HMqzynfrdbT?=
 =?us-ascii?Q?lf8omlIAR28RZCjrftTekVAOnbLSWMbRXRC20BNWuAkoZ6iAr3iRknoDH24q?=
 =?us-ascii?Q?8HExnDIaPRZ+rMaTfOOgYgKkirgbin/5jdkcBe7KKbdDy6sEGxmu2Dk+3xyG?=
 =?us-ascii?Q?WAuB/OGLAxFUky5FXvcVszkzxzk3CO+C3MmJ9dVN6T3AQOa/EPN1Hh3ltAk8?=
 =?us-ascii?Q?hABEeYv8gacSMRBVBJ23HxG+m8pmxm/MmhwhOzBWpSVVJMpZbPiLyAJJVtAQ?=
 =?us-ascii?Q?Am3N0YgxekT93YveOiFhCBnjh7KON9T9gr9vHjBKirPeOcT8gEnk6KTtG7x7?=
 =?us-ascii?Q?n5o0Js2WEjOVb/GfrJFKXVMoN0asW/lZCgwyWTIdk9TBJpO1I3UH053x0Em+?=
 =?us-ascii?Q?N+D5vB31j3AOwWSWzWr3ZP7iAq9m/wfXfQMxAFvev7V0spTbqrUhgmqZvAXW?=
 =?us-ascii?Q?ao/hK4bp3AG54gTDpQ3lUNWIZm3VK5xvSgRcKzyniIJEIvRpA24OFsUbv/Lo?=
 =?us-ascii?Q?WB9nsBU9MzOx9/2nVVk1MduAnK98siWfcKvJKs+jlBbkBMlUV8KwugDjDqmy?=
 =?us-ascii?Q?WLPPD0IOsr2SWNFsPPaQSL4cltCzW8NxUn6qnsVHu4A/WzVsrZSBerUIcZaW?=
 =?us-ascii?Q?qGFyA3eKXlHHrLBLKnEBEXkX8PE7YMxJ7oL3g2zRtNVXzUbMm0OuDg3XaeUj?=
 =?us-ascii?Q?DA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?JaSTYKgLQMlCkjy4aPnu3up8OIr8Lb22GO8HgpFXZt6+LgncKLvHGBdzJX1m?=
 =?us-ascii?Q?pmyOP8FjaLWWCs3w0YBHQ3ybM83w6JwA+jKzxdQnY7QH8vqcA8/kQv2HYs+T?=
 =?us-ascii?Q?o8JTN9MaZkFWzLq2VuSQaJRMN1/gU75jDpEGi8FTHIOYdeN5Oxsc2CWoZsaW?=
 =?us-ascii?Q?un/Kq0KFEMl1VI4S3aReGKo6Fkeer/6zXfDI0rrJFzBodGASu6A62MKxwdYC?=
 =?us-ascii?Q?1MS4NtumIp8ZuIS4WRpEi8x/Fswy51fjPD0PBFr52tdazMpuGyFmrPrJjk6B?=
 =?us-ascii?Q?Zd1EBxBbGC+mJUJj4cTBbObkrtYtKgHgAHt+zT/2i9HF/uWYPtyaZnWanQYa?=
 =?us-ascii?Q?HZCegH8ln+eDzxHGXAT4Q79QH21B7hArE0MmzqVBD7X/RFYjuQXEsZjr93VX?=
 =?us-ascii?Q?o2dgGgOInp+opoFgH0gwYIlclDDHFucipt0hBEetvlD1HCaRpLD4kabWbPXk?=
 =?us-ascii?Q?YbocBnGQc7UnmSrqXLRqqEnU64Ardr8huwyjPpKWzzis4ErASBLDkvGG5zmZ?=
 =?us-ascii?Q?W1D1XSVyllt2kxqHYWn3utl5QYNUVVmU0fphV7AUwAt+TgE77a6EknQMx9VF?=
 =?us-ascii?Q?dv7I7WJPk3VZqb7LGVXqw99Smz/lA6esrjNF74LiI4tSCxRnGeXKp+XP/4zW?=
 =?us-ascii?Q?5FGRXLaxwBO66CCU9qaFDQsUq8cajC3IsHzlUeyVs0aNsXOF5HvGdwRPMNsT?=
 =?us-ascii?Q?hl5opnu0d0phpMH3e/eqOxoPUS59I54aV7IG8Eqk/r0zHJxRMGOiVrmqsyXg?=
 =?us-ascii?Q?I0p219qvqjNtTSsI1PRXkPZ/bRiSC6h/bRLC+6JNMnc1hF8/Gu6PxSP0KOOn?=
 =?us-ascii?Q?rWdib4AhR/FRaqOg8gpixQOSL128Pz2/Q+dAWktGv4oWXUvMibeeKV5HAWCF?=
 =?us-ascii?Q?5ya+FqC8rIX1GLFY/QuEkG9de2pjRO0K7VJ2x7hRoF00HxH1udugNT4v6l91?=
 =?us-ascii?Q?EXq5bzJUFZzjoeemc7huQg=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0f7efe8f-204a-4a91-0768-08db9cd05518
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2023 14:11:19.8647
 (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: 63KMDyjCiiVspK87lqnSXd64n6ibI0ZWNX/Trps4HaRKG3ICFOxq8gQHkJQi3YJuoaboTExKIk762Tp5YmqZtw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB6417
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26
 definitions=2023-08-14_10,2023-08-10_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxlogscore=999
 spamscore=0 mlxscore=0 adultscore=0 bulkscore=0 suspectscore=0
 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2306200000 definitions=main-2308140131
X-Proofpoint-GUID: 0IR1psQEs9U-LWV6OhBqCV8eaZQkyNzf
X-Proofpoint-ORIG-GUID: 0IR1psQEs9U-LWV6OhBqCV8eaZQkyNzf
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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

Since libsas was introduced in commit 2908d778ab3e ("[SCSI] aic94xx: new
driver"), sas_ata_task.stp_affil_pol is never set, so delete it and the
reference in asd_build_ata_ascb().

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 drivers/scsi/aic94xx/aic94xx_task.c | 6 +-----
 include/scsi/libsas.h               | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c
index ca435811c310..21b69e592664 100644
--- a/drivers/scsi/aic94xx/aic94xx_task.c
+++ b/drivers/scsi/aic94xx/aic94xx_task.c
@@ -390,11 +390,7 @@ static int asd_build_ata_ascb(struct asd_ascb *ascb, struct sas_task *task,
 
 		scb->ata_task.retry_count = task->ata_task.retry_count;
 
-		if (task->ata_task.stp_affil_pol)
-			flags = STP_AFFIL_POLICY;
-		else
-			flags = 0;
-		scb->ata_task.flags = flags;
+		scb->ata_task.flags = 0;
 	}
 	ascb->tasklet_complete = asd_task_tasklet_complete;
 
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 3a52094090a1..a65c16643315 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -529,7 +529,6 @@ struct sas_ata_task {
 
 	u8     dma_xfer:1;	  /* PIO:0 or DMA:1 */
 	u8     use_ncq:1;
-	u8     stp_affil_pol:1;
 
 	u8     device_control_reg_update:1;
 
-- 
2.35.3