From: Christoph Hellwig <hch@lst.de>
To: tj@kernel.org
Cc: geert@linux-m68k.org, linux-ide@vger.kernel.org
Subject: [PATCH 3/6] libata: remove the done allback from ata_scsi_args
Date: Tue, 10 Jan 2017 09:41:45 +0100 [thread overview]
Message-ID: <1484037708-654-4-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1484037708-654-1-git-send-email-hch@lst.de>
It's always the scsi_done callback, and we can get at that easily
in the place where ->done is called.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/ata/libata-scsi.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 43694f5..28e2530 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2061,7 +2061,6 @@ struct ata_scsi_args {
struct ata_device *dev;
u16 *id;
struct scsi_cmnd *cmd;
- void (*done)(struct scsi_cmnd *);
};
/**
@@ -2140,7 +2139,7 @@ static void ata_scsi_rbuf_fill(struct ata_scsi_args *args,
if (rc == 0)
cmd->result = SAM_STAT_GOOD;
- args->done(cmd);
+ cmd->scsi_done(cmd);
}
/**
@@ -4357,7 +4356,6 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd)
args.dev = dev;
args.id = dev->id;
args.cmd = cmd;
- args.done = cmd->scsi_done;
switch(scsicmd[0]) {
case INQUIRY:
--
2.1.4
next prev parent reply other threads:[~2017-01-10 8:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-10 8:41 libata: remove the global response buffer Christoph Hellwig
2017-01-10 8:41 ` [PATCH 1/6] libata: avoid global response buffer in atapi_qc_complete Christoph Hellwig
2017-01-10 8:41 ` [PATCH 2/6] libata: move struct ata_scsi_args to libata-scsi.c Christoph Hellwig
2017-01-10 8:41 ` Christoph Hellwig [this message]
2017-01-10 8:41 ` [PATCH 4/6] libata: call ->scsi_done from ata_scsi_simulate Christoph Hellwig
2017-01-10 8:41 ` [PATCH 5/6] libata: don't call ata_scsi_rbuf_fill for command without a response buffer Christoph Hellwig
2017-01-10 8:41 ` [PATCH 6/6] libata: switch to dynamic allocation insted of ata_scsi_rbuf Christoph Hellwig
2017-01-10 14:40 ` Christoph Hellwig
2017-01-10 15:56 ` libata: remove the global response buffer Tejun Heo
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=1484037708-654-4-git-send-email-hch@lst.de \
--to=hch@lst.de \
--cc=geert@linux-m68k.org \
--cc=linux-ide@vger.kernel.org \
--cc=tj@kernel.org \
/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