iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '6.8/scsi-staging' into 6.8/scsi-fixes

Browse Source 
Pull in staged fixes for 6.8.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Martin K. Petersen
2024-01-22 15:49:29 -05:00
parent 6613476e22 7d1ae55ffe
commit 52998cdd8d
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -10282,7 +10282,7 @@ F: drivers/scsi/ibmvscsi/ibmvscsi*
F: include/scsi/viosrp.h F: include/scsi/viosrp.h
IBM Power Virtual SCSI Device Target Driver IBM Power Virtual SCSI Device Target Driver
M: Michael Cyr <mikecyr@linux.ibm.com> M: Tyrel Datwyler <tyreld@linux.ibm.com>
L: linux-scsi@vger.kernel.org L: linux-scsi@vger.kernel.org
L: target-devel@vger.kernel.org L: target-devel@vger.kernel.org
S: Supported S: Supported

3
drivers/scsi/initio.c
View File

@ -371,7 +371,6 @@ static u16 initio_se2_rd(unsigned long base, u8 addr)
*/ */
static void initio_se2_wr(unsigned long base, u8 addr, u16 val) static void initio_se2_wr(unsigned long base, u8 addr, u16 val)
{ {
u8 rb;
u8 instr; u8 instr;
int i; int i;
@ -400,7 +399,7 @@ static void initio_se2_wr(unsigned long base, u8 addr, u16 val)
udelay(30); udelay(30);
outb(SE2CS, base + TUL_NVRAM); /* -CLK */ outb(SE2CS, base + TUL_NVRAM); /* -CLK */
udelay(30); udelay(30);
if ((rb = inb(base + TUL_NVRAM)) & SE2DI) if (inb(base + TUL_NVRAM) & SE2DI)
break; /* write complete */ break; /* write complete */
} }
outb(0, base + TUL_NVRAM); /* -CS */ outb(0, base + TUL_NVRAM); /* -CS */

2
drivers/scsi/isci/request.c
View File

@ -3387,7 +3387,7 @@ static enum sci_status isci_io_request_build(struct isci_host *ihost,
return SCI_FAILURE; return SCI_FAILURE;
} }
return SCI_SUCCESS; return status;
} }
static struct isci_request *isci_request_from_tag(struct isci_host *ihost, u16 tag) static struct isci_request *isci_request_from_tag(struct isci_host *ihost, u16 tag)

2
drivers/scsi/virtio_scsi.c
View File

@ -188,8 +188,6 @@ static void virtscsi_vq_done(struct virtio_scsi *vscsi,
while ((buf = virtqueue_get_buf(vq, &len)) != NULL) while ((buf = virtqueue_get_buf(vq, &len)) != NULL)
fn(vscsi, buf); fn(vscsi, buf);
if (unlikely(virtqueue_is_broken(vq)))
break;
} while (!virtqueue_enable_cb(vq)); } while (!virtqueue_enable_cb(vq));
spin_unlock_irqrestore(&virtscsi_vq->vq_lock, flags); spin_unlock_irqrestore(&virtscsi_vq->vq_lock, flags);
} }