Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit beb40487 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by James Bottomley
Browse files

[SCSI] remove scsi_request infrastructure 



With Achim patch the last user (gdth) is switched away from scsi_request
so we an kill it now.  Also disables some code in i2o_scsi that was
broken since the sg driver stopped using scsi_requests.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 1951d099

drivers/message/i2o/i2o_scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -65,9 +65,7 @@ 
#include <scsi/scsi_host.h>

#include <scsi/scsi_device.h>

#include <scsi/scsi_cmnd.h>

#include <scsi/scsi_request.h>

#include <scsi/sg.h>

#include <scsi/sg_request.h>



#define OSM_NAME	"scsi-osm"

#define OSM_VERSION	"1.316"
@@ -588,6 +586,7 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt, 


	mptr = &msg->body[0];



#if 0 /* this code can't work */

#ifdef CONFIG_I2O_EXT_ADAPTEC

	if (c->adaptec) {

		u32 adpt_flags = 0;
@@ -624,6 +623,7 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt, 
		*mptr++ = cpu_to_le32(I2O_VENDOR_DPT << 16 | I2O_CMD_SCSI_EXEC);

		*mptr++ = cpu_to_le32(adpt_flags | tid);

	}

#endif

#endif



	msg->u.head[1] = cpu_to_le32(cmd | HOST_TID << 12 | tid);

drivers/scsi/constants.c

+1 −11
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ 
#include <linux/kernel.h>



#include <scsi/scsi.h>

#include <scsi/scsi_cmnd.h>

#include <scsi/scsi_device.h>

#include <scsi/scsi_host.h>

#include <scsi/scsi_request.h>

#include <scsi/scsi_eh.h>

#include <scsi/scsi_dbg.h>
@@ -1261,16 +1261,6 @@ void scsi_print_sense(const char *devclass, struct scsi_cmnd *cmd) 
}

EXPORT_SYMBOL(scsi_print_sense);



void scsi_print_req_sense(const char *devclass, struct scsi_request *sreq)

{

	const char *name = devclass;



	if (sreq->sr_request->rq_disk)

		name = sreq->sr_request->rq_disk->disk_name;

	__scsi_print_sense(name, sreq->sr_sense_buffer, SCSI_SENSE_BUFFERSIZE);

}

EXPORT_SYMBOL(scsi_print_req_sense);



void scsi_print_command(struct scsi_cmnd *cmd)

{

	/* Assume appended output (i.e. not at start of line) */

drivers/scsi/gdth.c

+4 −4
Original line number Diff line number Diff line
@@ -716,8 +716,8 @@ static void gdth_scsi_done(struct scsi_cmnd *scp) 
{

    TRACE2(("gdth_scsi_done()\n"));



    if (scp->sc_request)

        complete((struct completion *)scp->sc_request);

    if (scp->request)

        complete((struct completion *)scp->request);

}



int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,
@@ -732,8 +732,8 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd, 
        return -ENOMEM;

    memset(scp, 0, sizeof(*scp));

    scp->device = sdev;

    /* use sc_request field to save the ptr. to completion struct. */

    scp->sc_request = (struct scsi_request *)&wait;

    /* use request field to save the ptr. to completion struct. */

    scp->request = (struct request *)&wait;

    scp->timeout_per_command = timeout*HZ;

    scp->request_buffer = gdtcmd;

    scp->cmd_len = 12;

drivers/scsi/ipr.c

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ 
#include <scsi/scsi_tcq.h>

#include <scsi/scsi_eh.h>

#include <scsi/scsi_cmnd.h>

#include <scsi/scsi_request.h>

#include "ipr.h"



/*

drivers/scsi/libata-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ 
#include <linux/spinlock.h>

#include <scsi/scsi.h>

#include <scsi/scsi_host.h>

#include <scsi/scsi_cmnd.h>

#include <scsi/scsi_eh.h>

#include <scsi/scsi_device.h>

#include <scsi/scsi_request.h>

#include <scsi/scsi_transport.h>

#include <linux/libata.h>

#include <linux/hdreg.h>