Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

acornscsi: remove linked command support

The acornscsi driver was added in v2.1.88. It has always #undef-ed
CONFIG_SCSI_ACORNSCSI_LINK near the top of acornscsi.c. And, just to be
sure, it has also always triggered a preprocessor error if
CONFIG_SCSI_ACORNSCSI_LINK was still defined. But, as far as I can see,
it has never even been possible to set SCSI_ACORNSCSI_LINK through
kconfig, or its predecessors, in the first place.

Let's remove the code involved.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>

authored by

Paul Bolle and committed by
Christoph Hellwig
e6842f09 16b9d870

-53
-53
drivers/scsi/arm/acornscsi.c
··· 62 62 */ 63 63 #undef CONFIG_SCSI_ACORNSCSI_TAGGED_QUEUE 64 64 /* 65 - * SCSI-II Linked command support. 66 - * 67 - * The higher level code doesn't support linked commands yet, and so the option 68 - * is undef'd here. 69 - */ 70 - #undef CONFIG_SCSI_ACORNSCSI_LINK 71 - /* 72 65 * SCSI-II Synchronous transfer support. 73 66 * 74 67 * Tried and tested... ··· 151 158 #define ABORT_TAG 0xd 152 159 #else 153 160 #error "Yippee! ABORT TAG is now defined! Remove this error!" 154 - #endif 155 - 156 - #ifdef CONFIG_SCSI_ACORNSCSI_LINK 157 - #error SCSI2 LINKed commands not supported (yet)! 158 161 #endif 159 162 160 163 #ifdef USE_DMAC ··· 1657 1668 } 1658 1669 break; 1659 1670 1660 - #ifdef CONFIG_SCSI_ACORNSCSI_LINK 1661 - case LINKED_CMD_COMPLETE: 1662 - case LINKED_FLG_CMD_COMPLETE: 1663 - /* 1664 - * We don't support linked commands yet 1665 - */ 1666 - if (0) { 1667 - #if (DEBUG & DEBUG_LINK) 1668 - printk("scsi%d.%c: lun %d tag %d linked command complete\n", 1669 - host->host->host_no, acornscsi_target(host), host->SCpnt->tag); 1670 - #endif 1671 - /* 1672 - * A linked command should only terminate with one of these messages 1673 - * if there are more linked commands available. 1674 - */ 1675 - if (!host->SCpnt->next_link) { 1676 - printk(KERN_WARNING "scsi%d.%c: lun %d tag %d linked command complete, but no next_link\n", 1677 - instance->host_no, acornscsi_target(host), host->SCpnt->tag); 1678 - acornscsi_sbic_issuecmd(host, CMND_ASSERTATN); 1679 - msgqueue_addmsg(&host->scsi.msgs, 1, ABORT); 1680 - } else { 1681 - struct scsi_cmnd *SCpnt = host->SCpnt; 1682 - 1683 - acornscsi_dma_cleanup(host); 1684 - 1685 - host->SCpnt = host->SCpnt->next_link; 1686 - host->SCpnt->tag = SCpnt->tag; 1687 - SCpnt->result = DID_OK | host->scsi.SCp.Message << 8 | host->Scsi.SCp.Status; 1688 - SCpnt->done(SCpnt); 1689 - 1690 - /* initialise host->SCpnt->SCp */ 1691 - } 1692 - break; 1693 - } 1694 - #endif 1695 - 1696 1671 default: /* reject message */ 1697 1672 printk(KERN_ERR "scsi%d.%c: unrecognised message %02X, rejecting\n", 1698 1673 host->host->host_no, acornscsi_target(host), ··· 2778 2825 #ifdef CONFIG_SCSI_ACORNSCSI_TAGGED_QUEUE 2779 2826 " TAG" 2780 2827 #endif 2781 - #ifdef CONFIG_SCSI_ACORNSCSI_LINK 2782 - " LINK" 2783 - #endif 2784 2828 #if (DEBUG & DEBUG_NO_WRITE) 2785 2829 " NOWRITE (" __stringify(NO_WRITE) ")" 2786 2830 #endif ··· 2800 2850 #endif 2801 2851 #ifdef CONFIG_SCSI_ACORNSCSI_TAGGED_QUEUE 2802 2852 " TAG" 2803 - #endif 2804 - #ifdef CONFIG_SCSI_ACORNSCSI_LINK 2805 - " LINK" 2806 2853 #endif 2807 2854 #if (DEBUG & DEBUG_NO_WRITE) 2808 2855 " NOWRITE (" __stringify(NO_WRITE) ")"