From: Mike Christie <michael.christie@oracle.com>
To: bvanassche@acm.org, mwilck@suse.com, hch@lst.de,
martin.petersen@oracle.com, linux-scsi@vger.kernel.org,
james.bottomley@hansenpartnership.com
Cc: Mike Christie <michael.christie@oracle.com>
Subject: [PATCH 03/15] hwmon: drivetemp: Convert to scsi_execute_cmd
Date: Mon, 21 Nov 2022 21:39:22 -0600 [thread overview]
Message-ID: <20221122033934.33797-4-michael.christie@oracle.com> (raw)
In-Reply-To: <20221122033934.33797-1-michael.christie@oracle.com>
scsi_execute_req is going to be removed. Convert drivetemp to
scsi_execute_cmd.
Signed-off-by: Mike Christie <michael.christie@oracle.com>
---
drivers/hwmon/drivetemp.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/hwmon/drivetemp.c b/drivers/hwmon/drivetemp.c
index 5bac2b0fc7bb..015a16d6b007 100644
--- a/drivers/hwmon/drivetemp.c
+++ b/drivers/hwmon/drivetemp.c
@@ -164,7 +164,7 @@ static int drivetemp_scsi_command(struct drivetemp_data *st,
u8 lba_low, u8 lba_mid, u8 lba_high)
{
u8 scsi_cmd[MAX_COMMAND_SIZE];
- int data_dir;
+ enum req_op op;
memset(scsi_cmd, 0, sizeof(scsi_cmd));
scsi_cmd[0] = ATA_16;
@@ -175,7 +175,7 @@ static int drivetemp_scsi_command(struct drivetemp_data *st,
* field.
*/
scsi_cmd[2] = 0x06;
- data_dir = DMA_TO_DEVICE;
+ op = REQ_OP_DRV_OUT;
} else {
scsi_cmd[1] = (4 << 1); /* PIO Data-in */
/*
@@ -183,7 +183,7 @@ static int drivetemp_scsi_command(struct drivetemp_data *st,
* field.
*/
scsi_cmd[2] = 0x0e;
- data_dir = DMA_FROM_DEVICE;
+ op = REQ_OP_DRV_IN;
}
scsi_cmd[4] = feature;
scsi_cmd[6] = 1; /* 1 sector */
@@ -192,9 +192,8 @@ static int drivetemp_scsi_command(struct drivetemp_data *st,
scsi_cmd[12] = lba_high;
scsi_cmd[14] = ata_command;
- return scsi_execute_req(st->sdev, scsi_cmd, data_dir,
- st->smartdata, ATA_SECT_SIZE, NULL, HZ, 5,
- NULL);
+ return __scsi_execute_cmd(st->sdev, scsi_cmd, op, st->smartdata,
+ ATA_SECT_SIZE, HZ, 5, NULL);
}
static int drivetemp_ata_command(struct drivetemp_data *st, u8 feature,
--
2.25.1
next prev parent reply other threads:[~2022-11-22 3:40 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-22 3:39 [PATCH 00/15] Add struct to pass in optional args to scsi_execute Mike Christie
2022-11-22 3:39 ` [PATCH 01/15] scsi: Add struct for args to execution functions Mike Christie
2022-11-22 6:36 ` Christoph Hellwig
2022-11-22 9:16 ` John Garry
2022-11-22 15:44 ` Mike Christie
2022-11-22 3:39 ` [PATCH 02/15] scsi: libata: Convert to scsi_execute_cmd Mike Christie
2022-11-22 3:39 ` Mike Christie [this message]
2022-11-22 3:39 ` [PATCH 04/15] scsi: ch: " Mike Christie
2022-11-22 3:39 ` [PATCH 05/15] scsi: scsi_dh: " Mike Christie
2022-11-22 3:39 ` [PATCH 06/15] scsi: core: " Mike Christie
2022-11-22 6:38 ` Christoph Hellwig
2022-11-22 16:13 ` Mike Christie
2022-11-22 18:46 ` Bart Van Assche
2022-11-22 20:06 ` Mike Christie
2022-11-22 3:39 ` [PATCH 07/15] scsi: spi: " Mike Christie
2022-11-22 3:39 ` [PATCH 08/15] scsi: sd: " Mike Christie
2022-11-22 3:39 ` [PATCH 09/15] scsi: zbc: " Mike Christie
2022-11-22 3:39 ` [PATCH 10/15] scsi: ses: " Mike Christie
2022-11-22 3:39 ` [PATCH 11/15] scsi: sr: " Mike Christie
2022-11-22 3:39 ` [PATCH 12/15] scsi: virtio_scsi: " Mike Christie
2022-11-22 3:39 ` [PATCH 13/15] scsi: target_core_pscsi: " Mike Christie
2022-11-22 3:39 ` [PATCH 14/15] scsi: cxlflash: " Mike Christie
2022-11-22 3:39 ` [PATCH 15/15] scsi: Remove scsi_execute functions Mike Christie
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=20221122033934.33797-4-michael.christie@oracle.com \
--to=michael.christie@oracle.com \
--cc=bvanassche@acm.org \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mwilck@suse.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