From: Martin K. Petersen Date: Fri, 25 Aug 2023 01:06:16 +0000 (-0400) Subject: Merge patch series "libsas: Some tidy-up" X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1451455e6ffb62ff421ebc9d6da4552b02474b3a;p=linux.git Merge patch series "libsas: Some tidy-up" John Garry says: This series tidies-up libsas a bit, including: - delete structure(s) with only one member - delete structure members which are only ever set - delete structure members which are never set and code which relies on that member being set This conflicts with the following series: https://lore.kernel.org/linux-scsi/20230809132249.37948-1-yuehaibing@huawei.com/ Any conflict should be trivial to resolve. Based on mkp-scsi staging at a18e81d17a7e ("scsi: ufs: ufs-pci: Add support for QEMU") Link: https://lore.kernel.org/r/20230815115156.343535-1-john.g.garry@oracle.com Signed-off-by: Martin K. Petersen --- 1451455e6ffb62ff421ebc9d6da4552b02474b3a diff --cc include/scsi/libsas.h index 52121f9b0fd79,2601f5775a993..8a43534eea5cb --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@@ -544,13 -525,8 +525,9 @@@ struct sas_ata_task struct host_to_dev_fis fis; u8 atapi_packet[16]; /* 0 if not ATAPI task */ - u8 retry_count; /* hardware retry, should be > 0 */ - u8 dma_xfer:1; /* PIO:0 or DMA:1 */ u8 use_ncq:1; - u8 set_affil_pol:1; - u8 stp_affil_pol:1; + u8 return_fis_on_success:1; u8 device_control_reg_update:1;