Skip to content

Commit e81f107

Browse files
cataliniacobmartinkpetersen
authored andcommitted
scsi: core: Remove export for scsi_device_from_queue()
Commit 1cea518 ("block: remove pktcdvd driver") left behind an export that is now dead code. Remove it and move the declaration of scsi_device_from_queue() to drivers/scsi/scsi_priv.h. Signed-off-by: Catalin Iacob <iacobcatalin@gmail.com> Link: https://patch.msgid.link/20260608-remove-pktcdvd-references-v4-1-72f88b04cc87@gmail.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 4f87e90 commit e81f107

3 files changed

Lines changed: 1 addition & 9 deletions

File tree

drivers/scsi/scsi_lib.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2224,14 +2224,6 @@ struct scsi_device *scsi_device_from_queue(struct request_queue *q)
22242224

22252225
return sdev;
22262226
}
2227-
/*
2228-
* pktcdvd should have been integrated into the SCSI layers, but for historical
2229-
* reasons like the old IDE driver it isn't. This export allows it to safely
2230-
* probe if a given device is a SCSI one and only attach to that.
2231-
*/
2232-
#ifdef CONFIG_CDROM_PKTCDVD_MODULE
2233-
EXPORT_SYMBOL_GPL(scsi_device_from_queue);
2234-
#endif
22352227

22362228
/**
22372229
* scsi_block_requests - Utility function used by low-level drivers to prevent

drivers/scsi/scsi_priv.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ void scsi_eh_done(struct scsi_cmnd *scmd);
102102

103103
/* scsi_lib.c */
104104
extern void scsi_device_unbusy(struct scsi_device *sdev, struct scsi_cmnd *cmd);
105+
extern struct scsi_device *scsi_device_from_queue(struct request_queue *q);
105106
extern void scsi_queue_insert(struct scsi_cmnd *cmd,
106107
enum scsi_qc_status reason);
107108
extern void scsi_io_completion(struct scsi_cmnd *, unsigned int);

include/scsi/scsi_device.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,6 @@ void scsi_attach_vpd(struct scsi_device *sdev);
408408
void scsi_cdl_check(struct scsi_device *sdev);
409409
int scsi_cdl_enable(struct scsi_device *sdev, bool enable);
410410

411-
extern struct scsi_device *scsi_device_from_queue(struct request_queue *q);
412411
extern int __must_check scsi_device_get(struct scsi_device *);
413412
extern void scsi_device_put(struct scsi_device *);
414413
extern struct scsi_device *scsi_device_lookup(struct Scsi_Host *,

0 commit comments

Comments
 (0)