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

Commit fd9cd67c authored by Finn Thain's avatar Finn Thain Committed by Christoph Hellwig
Browse files

dmx3191d: Use NO_IRQ 



Testing shows that the Domex 3191D card never asserts its IRQ. Hence it is
non-functional with Linux (worse, the EH bugs in the core driver are fatal
but that's a problem for another patch). Perhaps the DT-536 chip needs
special setup? I can't find documentation for it. The NetBSD driver uses
polling apparently because of this issue.

Set host->irq = NO_IRQ so the core driver will prevent targets from
disconnecting. Don't request host->irq.

Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 710ddd0d

drivers/scsi/dmx3191d.c

+8 −17
Original line number Original line Diff line number Diff line
@@ -34,6 +34,8 @@ 
 * Definitions for the generic 5380 driver.

 * Definitions for the generic 5380 driver.

 */

 */





#define DONT_USE_INTR



#define NCR5380_read(reg)		inb(port + reg)

#define NCR5380_read(reg)		inb(port + reg)

#define NCR5380_write(reg, value)	outb(value, port + reg)

#define NCR5380_write(reg, value)	outb(value, port + reg)
@@ -89,32 +91,23 @@ static int dmx3191d_probe_one(struct pci_dev *pdev, 
	if (!shost)

	if (!shost)

		goto out_release_region;       

		goto out_release_region;       

	shost->io_port = io;

	shost->io_port = io;

	shost->irq = pdev->irq;



	NCR5380_init(shost, FLAG_NO_PSEUDO_DMA | FLAG_DTC3181E);





	if (request_irq(pdev->irq, NCR5380_intr, IRQF_SHARED,

	/* This card does not seem to raise an interrupt on pdev->irq.

				DMX3191D_DRIVER_NAME, shost)) {

	 * Steam-powered SCSI controllers run without an IRQ anyway.

		/*

		 * Steam powered scsi controllers run without an IRQ anyway

	 */

	 */

		printk(KERN_WARNING "dmx3191: IRQ %d not available - "

				    "switching to polled mode.\n", pdev->irq);

	shost->irq = NO_IRQ;

	shost->irq = NO_IRQ;

	}



	NCR5380_init(shost, FLAG_NO_PSEUDO_DMA | FLAG_DTC3181E);





	pci_set_drvdata(pdev, shost);

	pci_set_drvdata(pdev, shost);





	error = scsi_add_host(shost, &pdev->dev);

	error = scsi_add_host(shost, &pdev->dev);

	if (error)

	if (error)

		goto out_free_irq;

		goto out_release_region;





	scsi_scan_host(shost);

	scsi_scan_host(shost);

	return 0;

	return 0;





 out_free_irq:

	if (shost->irq != NO_IRQ)

		free_irq(shost->irq, shost);

 out_release_region:

 out_release_region:

	release_region(io, DMX3191D_REGION_LEN);

	release_region(io, DMX3191D_REGION_LEN);

 out_disable_device:

 out_disable_device:
@@ -131,8 +124,6 @@ static void dmx3191d_remove_one(struct pci_dev *pdev) 




	NCR5380_exit(shost);

	NCR5380_exit(shost);





	if (shost->irq != NO_IRQ)

		free_irq(shost->irq, shost);

	release_region(shost->io_port, DMX3191D_REGION_LEN);

	release_region(shost->io_port, DMX3191D_REGION_LEN);

	pci_disable_device(pdev);

	pci_disable_device(pdev);