From: Richard Weinberger <richard@nod.at>
To: linux-mtd@lists.infradead.org
Cc: Christoph Hellwig <hch@infradead.org>,
Stephan Wurm <stephan.wurm@a-eberle.de>,
Richard Weinberger <richard@nod.at>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Vignesh Raghavendra <vigneshr@ti.com>,
Oliver Neukum <oliver@neukum.org>, Ali Akcaagac <aliakc@web.de>,
Jamie Lenehan <lenehan@twibble.org>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>,
linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org
Subject: [PATCH 3/7] scsi: dc395x: Switch to kmap_sg
Date: Thu, 10 Aug 2023 18:00:14 +0200 [thread overview]
Message-ID: <20230810160019.16977-4-richard@nod.at> (raw)
In-Reply-To: <20230810160019.16977-1-richard@nod.at>
Switch to our new helper from scatterlist lib.
No functional change, the mapped region is still used in atomic
context.
Maybe local_irq_save() can be dropped, but I don't know this driver
well enough.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
drivers/scsi/dc395x.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index c8e86f8a631eb..4a4e7a35328b9 100644
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -2122,7 +2122,7 @@ static void data_in_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb,
local_irq_save(flags);
/* Assumption: it's inside one page as it's at most 4 bytes and
I just assume it's on a 4-byte boundary */
- base = scsi_kmap_atomic_sg(scsi_sglist(srb->cmd),
+ base = kmap_sg(scsi_sglist(srb->cmd),
srb->sg_count, &offset, &len);
virt = base + offset;
@@ -2165,7 +2165,7 @@ static void data_in_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb,
DC395x_write8(acb, TRM_S1040_SCSI_CONFIG2, 0);
}
- scsi_kunmap_atomic_sg(base);
+ kunmap_sg(base);
local_irq_restore(flags);
}
/*printk(" %08x", *(u32*)(bus_to_virt (addr))); */
@@ -2339,7 +2339,7 @@ static void data_io_transfer(struct AdapterCtlBlk *acb,
local_irq_save(flags);
/* Again, max 4 bytes */
- base = scsi_kmap_atomic_sg(scsi_sglist(srb->cmd),
+ base = kmap_sg(scsi_sglist(srb->cmd),
srb->sg_count, &offset, &len);
virt = base + offset;
@@ -2354,7 +2354,7 @@ static void data_io_transfer(struct AdapterCtlBlk *acb,
sg_subtract_one(srb);
}
- scsi_kunmap_atomic_sg(base);
+ kunmap_sg(base);
local_irq_restore(flags);
}
if (srb->dcb->sync_period & WIDE_SYNC) {
@@ -3290,7 +3290,7 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
size_t offset = 0, len = sizeof(struct ScsiInqData);
local_irq_save(flags);
- base = scsi_kmap_atomic_sg(sg, scsi_sg_count(cmd), &offset, &len);
+ base = kmap_sg(sg, scsi_sg_count(cmd), &offset, &len);
ptr = (struct ScsiInqData *)(base + offset);
if (!ckc_only && get_host_byte(cmd) == DID_OK
@@ -3308,7 +3308,7 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
}
}
- scsi_kunmap_atomic_sg(base);
+ kunmap_sg(base);
local_irq_restore(flags);
}
--
2.35.3
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2023-08-10 16:00 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-10 16:00 [PATCH 0/7] Fix UBI Block wrt. highmem Richard Weinberger
2023-08-10 16:00 ` [PATCH 1/7] ubi: block: Refactor sg list processing for highmem Richard Weinberger
2023-08-10 16:06 ` Christoph Hellwig
2023-08-10 16:15 ` Richard Weinberger
2023-08-10 16:21 ` Christoph Hellwig
2023-08-10 19:54 ` Richard Weinberger
2023-08-11 8:12 ` Christoph Hellwig
2023-08-11 8:34 ` Richard Weinberger
2023-08-11 8:36 ` Christoph Hellwig
2023-08-10 16:00 ` [PATCH 2/7] scatterlist: Add kmap helpers Richard Weinberger
2023-08-10 16:00 ` Richard Weinberger [this message]
2023-08-10 16:00 ` [PATCH 4/7] scsi: esp_scsi: Switch to kmap_sg Richard Weinberger
2023-08-10 16:00 ` [PATCH 5/7] scsi: fdomain: " Richard Weinberger
2023-08-10 16:00 ` [PATCH 6/7] ubi: block: " Richard Weinberger
2023-08-10 16:00 ` [PATCH 7/7] scsi: core: Remove scsi_kmap_atomic_sg() Richard Weinberger
2023-08-11 5:52 ` [PATCH 0/7] Fix UBI Block wrt. highmem Miquel Raynal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230810160019.16977-4-richard@nod.at \
--to=richard@nod.at \
--cc=aliakc@web.de \
--cc=ezequiel@vanguardiasur.com.ar \
--cc=hch@infradead.org \
--cc=jejb@linux.ibm.com \
--cc=lenehan@twibble.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=miquel.raynal@bootlin.com \
--cc=oliver@neukum.org \
--cc=stephan.wurm@a-eberle.de \
--cc=vigneshr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox