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

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

[SCSI] unexport scsi_add_timer/scsi_delete_timer

parent c5478def
Loading
Loading
Loading
Loading
+0 −41
Original line number Diff line number Diff line
@@ -373,13 +373,11 @@ Summary:
   scsi_activate_tcq - turn on tag command queueing
   scsi_add_device - creates new scsi device (lu) instance
   scsi_add_host - perform sysfs registration and SCSI bus scan.
   scsi_add_timer - (re-)start timer on a SCSI command.
   scsi_adjust_queue_depth - change the queue depth on a SCSI device
   scsi_assign_lock - replace default host_lock with given lock
   scsi_bios_ptable - return copy of block device's partition table
   scsi_block_requests - prevent further commands being queued to given host
   scsi_deactivate_tcq - turn off tag command queueing
   scsi_delete_timer - cancel timer on a SCSI command.
   scsi_host_alloc - return a new scsi_host instance whose refcount==1
   scsi_host_get - increments Scsi_Host instance's refcount
   scsi_host_put - decrements Scsi_Host instance's refcount (free if 0)
@@ -457,27 +455,6 @@ struct scsi_device * scsi_add_device(struct Scsi_Host *shost,
int scsi_add_host(struct Scsi_Host *shost, struct device * dev)


/**
 * scsi_add_timer - (re-)start timer on a SCSI command.
 * @scmd:    pointer to scsi command instance
 * @timeout: duration of timeout in "jiffies"
 * @complete: pointer to function to call if timeout expires
 *
 *      Returns nothing
 *
 *      Might block: no
 *
 *      Notes: Each scsi command has its own timer, and as it is added
 *      to the queue, we set up the timer. When the command completes, 
 *      we cancel the timer. An LLD can use this function to change
 *      the existing timeout value.
 *
 *      Defined in: drivers/scsi/scsi_error.c
 **/
void scsi_add_timer(struct scsi_cmnd *scmd, int timeout, 
                    void (*complete)(struct scsi_cmnd *))


/**
 * scsi_adjust_queue_depth - allow LLD to change queue depth on a SCSI device
 * @sdev:       pointer to SCSI device to change queue depth on
@@ -565,24 +542,6 @@ void scsi_block_requests(struct Scsi_Host * shost)
void scsi_deactivate_tcq(struct scsi_device *sdev, int depth)


/**
 * scsi_delete_timer - cancel timer on a SCSI command.
 * @scmd:    pointer to scsi command instance
 *
 *      Returns 1 if able to cancel timer else 0 (i.e. too late or already
 *      cancelled).
 *
 *      Might block: no [may in the future if it invokes del_timer_sync()]
 *
 *      Notes: All commands issued by upper levels already have a timeout
 *      associated with them. An LLD can use this function to cancel the
 *      timer.
 *
 *      Defined in: drivers/scsi/scsi_error.c
 **/
int scsi_delete_timer(struct scsi_cmnd *scmd)


/**
 * scsi_host_alloc - create a scsi host adapter instance and perform basic
 *                   initialization.
+0 −2
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ void scsi_add_timer(struct scsi_cmnd *scmd, int timeout,

	add_timer(&scmd->eh_timeout);
}
EXPORT_SYMBOL(scsi_add_timer);

/**
 * scsi_delete_timer - Delete/cancel timer for a given function.
@@ -144,7 +143,6 @@ int scsi_delete_timer(struct scsi_cmnd *scmd)

	return rtn;
}
EXPORT_SYMBOL(scsi_delete_timer);

/**
 * scsi_times_out - Timeout function for normal scsi commands.
+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,9 @@ extern int __init scsi_init_devinfo(void);
extern void scsi_exit_devinfo(void);

/* scsi_error.c */
extern void scsi_add_timer(struct scsi_cmnd *, int,
		void (*)(struct scsi_cmnd *));
extern int scsi_delete_timer(struct scsi_cmnd *);
extern void scsi_times_out(struct scsi_cmnd *cmd);
extern int scsi_error_handler(void *host);
extern int scsi_decide_disposition(struct scsi_cmnd *cmd);
+0 −3
Original line number Diff line number Diff line
@@ -27,9 +27,6 @@ struct scsi_sense_hdr { /* See SPC-3 section 4.5 */
};


extern void scsi_add_timer(struct scsi_cmnd *, int,
		void (*)(struct scsi_cmnd *));
extern int scsi_delete_timer(struct scsi_cmnd *);
extern void scsi_report_bus_reset(struct Scsi_Host *, int);
extern void scsi_report_device_reset(struct Scsi_Host *, int, int);
extern int scsi_block_when_processing_errors(struct scsi_device *);