On 3/26/21 6:58 AM, Christoph Hellwig wrote:
> This is the last piece in the kernel requiring the block layer ISA
> bounce buffering, and it does not actually look used. So remove it
> to see if anyone screams, in which case we'll need to find a solution
> to fix it back up.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> Reviewed-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
> ---
> drivers/scsi/advansys.c | 283 ++++------------------------------------
> 1 file changed, 25 insertions(+), 258 deletions(-)
>
> diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
> index ec5627890809e6..ccdd78ac7abd95 100644
> --- a/drivers/scsi/advansys.c
> +++ b/drivers/scsi/advansys.c
> @@ -84,8 +84,6 @@ typedef unsigned char uchar;
>
> #define ASC_CS_TYPE unsigned short
>
> -#define ASC_IS_ISA (0x0001)
> -#define ASC_IS_ISAPNP (0x0081)
> #define ASC_IS_EISA (0x0002)
> #define ASC_IS_PCI (0x0004)
> #define ASC_IS_PCI_ULTRA (0x0104)
Any particular reason why the remaining ISA defines (like
ASC_CHIP_MIN_VER_ISA etc) are being left intact?
[ .. ]
> @@ -8768,16 +8662,6 @@ static void AscInitAscDvcVar(ASC_DVC_VAR *asc_dvc)
> }
>
> asc_dvc->cfg->isa_dma_speed = ASC_DEF_ISA_DMA_SPEED;
> -#ifdef CONFIG_ISA
> - if ((asc_dvc->bus_type & ASC_IS_ISA) != 0) {
> - if (chip_version >= ASC_CHIP_MIN_VER_ISA_PNP) {
> - AscSetChipIFC(iop_base, IFC_INIT_DEFAULT);
> - asc_dvc->bus_type = ASC_IS_ISAPNP;
> - }
> - asc_dvc->cfg->isa_dma_channel =
> - (uchar)AscGetIsaDmaChannel(iop_base);
> - }
> -#endif /* CONFIG_ISA */
> for (i = 0; i <= ASC_MAX_TID; i++) {
> asc_dvc->cur_dvc_qng[i] = 0;
> asc_dvc->max_dvc_qng[i] = ASC_MAX_SCSI1_QNG;
Please remove the 'isa_dma_channel' field from struct asc_dvc_cfg, too.
Cheers,
Hannes
--
Dr. Hannes Reinecke Kernel Storage Architect
hare@xxxxxxx +49 911 74053 688
SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), GF: Felix Imendörffer
