[SCSI] aic79xx: Remove dead code (1ede5f9f) · Commits · 戴 / test

drivers/scsi/aic7xxx/aic79xx_core.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -7084,7 +7084,6 @@ ahd_pause_and_flushwork(struct ahd_softc *ahd)

		ahd_flush_qoutfifo(ahd);

		ahd_platform_flushwork(ahd);
		ahd->flags &= ~AHD_ALL_INTERRUPTS;
		}

drivers/scsi/aic7xxx/aic79xx_osm.c

+0 −59

Original line number	Diff line number	Diff line
		@@ -802,59 +802,6 @@ ahd_dmamap_unload(struct ahd_softc *ahd, bus_dma_tag_t dmat, bus_dmamap_t map)
		}

		/******************* Platform Dependent Functions *************************/
		/*
		* Compare "left hand" softc with "right hand" softc, returning:
		* < 0 - lahd has a lower priority than rahd
		* 0 - Softcs are equal
		* > 0 - lahd has a higher priority than rahd
		*/
		int
		ahd_softc_comp(struct ahd_softc lahd, struct ahd_softc rahd)
		{
		int value;

		/*
		* Under Linux, cards are ordered as follows:
		* 1) PCI devices that are marked as the boot controller.
		* 2) PCI devices with BIOS enabled sorted by bus/slot/func.
		* 3) All remaining PCI devices sorted by bus/slot/func.
		*/
		#if 0
		value = (lahd->flags & AHD_BOOT_CHANNEL)
		- (rahd->flags & AHD_BOOT_CHANNEL);
		if (value != 0)
		/* Controllers set for boot have a higher priority */
		return (value);
		#endif

		value = (lahd->flags & AHD_BIOS_ENABLED)
		- (rahd->flags & AHD_BIOS_ENABLED);
		if (value != 0)
		/* Controllers with BIOS enabled have a higher priority */
		return (value);

		/* Still equal. Sort by bus/slot/func. */
		if (aic79xx_reverse_scan != 0)
		value = ahd_get_pci_bus(lahd->dev_softc)
		- ahd_get_pci_bus(rahd->dev_softc);
		else
		value = ahd_get_pci_bus(rahd->dev_softc)
		- ahd_get_pci_bus(lahd->dev_softc);
		if (value != 0)
		return (value);
		if (aic79xx_reverse_scan != 0)
		value = ahd_get_pci_slot(lahd->dev_softc)
		- ahd_get_pci_slot(rahd->dev_softc);
		else
		value = ahd_get_pci_slot(rahd->dev_softc)
		- ahd_get_pci_slot(lahd->dev_softc);
		if (value != 0)
		return (value);

		value = rahd->channel - lahd->channel;
		return (value);
		}

		static void
		ahd_linux_setup_iocell_info(u_long index, int instance, int targ, int32_t value)
		{
		@@ -1595,12 +1542,6 @@ ahd_linux_isr(int irq, void dev_id, struct pt_regs regs)
		return IRQ_RETVAL(ours);
		}

		void
		ahd_platform_flushwork(struct ahd_softc *ahd)
		{

		}

		void
		ahd_send_async(struct ahd_softc *ahd, char channel,
		u_int target, u_int lun, ac_code code, void *arg)

drivers/scsi/aic7xxx/aic79xx_osm.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -872,8 +872,6 @@ int ahd_platform_abort_scbs(struct ahd_softc *ahd, int target,
		role_t role, uint32_t status);
		irqreturn_t
		ahd_linux_isr(int irq, void dev_id, struct pt_regs regs);
		void ahd_platform_flushwork(struct ahd_softc *ahd);
		int ahd_softc_comp(struct ahd_softc , struct ahd_softc );
		void ahd_done(struct ahd_softc, struct scb);
		void ahd_send_async(struct ahd_softc *, char channel,
		u_int target, u_int lun, ac_code, void *);

Admin message