diff options
author | Hannes Reinecke <hare@suse.de> | 2006-03-08 06:57:28 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-12 10:02:36 -0500 |
commit | 1ede5f9fe59ea245ad0ba859cfb08ac5814f6269 (patch) | |
tree | c930002c9334dff3676927a1029a2647010e4f11 | |
parent | 0aa800db8f1927aefe6f0ba6ce9d70f044374aef (diff) |
[SCSI] aic79xx: Remove dead code
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_core.c | 1 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_osm.c | 59 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_osm.h | 2 |
3 files changed, 0 insertions, 62 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c index b6266fd31688..b2bcdd4ca1ab 100644 --- a/drivers/scsi/aic7xxx/aic79xx_core.c +++ b/drivers/scsi/aic7xxx/aic79xx_core.c | |||
@@ -7084,7 +7084,6 @@ ahd_pause_and_flushwork(struct ahd_softc *ahd) | |||
7084 | 7084 | ||
7085 | ahd_flush_qoutfifo(ahd); | 7085 | ahd_flush_qoutfifo(ahd); |
7086 | 7086 | ||
7087 | ahd_platform_flushwork(ahd); | ||
7088 | ahd->flags &= ~AHD_ALL_INTERRUPTS; | 7087 | ahd->flags &= ~AHD_ALL_INTERRUPTS; |
7089 | } | 7088 | } |
7090 | 7089 | ||
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c index 4eb7bba24a68..cb5f7af606ed 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c | |||
@@ -802,59 +802,6 @@ ahd_dmamap_unload(struct ahd_softc *ahd, bus_dma_tag_t dmat, bus_dmamap_t map) | |||
802 | } | 802 | } |
803 | 803 | ||
804 | /********************* Platform Dependent Functions ***************************/ | 804 | /********************* Platform Dependent Functions ***************************/ |
805 | /* | ||
806 | * Compare "left hand" softc with "right hand" softc, returning: | ||
807 | * < 0 - lahd has a lower priority than rahd | ||
808 | * 0 - Softcs are equal | ||
809 | * > 0 - lahd has a higher priority than rahd | ||
810 | */ | ||
811 | int | ||
812 | ahd_softc_comp(struct ahd_softc *lahd, struct ahd_softc *rahd) | ||
813 | { | ||
814 | int value; | ||
815 | |||
816 | /* | ||
817 | * Under Linux, cards are ordered as follows: | ||
818 | * 1) PCI devices that are marked as the boot controller. | ||
819 | * 2) PCI devices with BIOS enabled sorted by bus/slot/func. | ||
820 | * 3) All remaining PCI devices sorted by bus/slot/func. | ||
821 | */ | ||
822 | #if 0 | ||
823 | value = (lahd->flags & AHD_BOOT_CHANNEL) | ||
824 | - (rahd->flags & AHD_BOOT_CHANNEL); | ||
825 | if (value != 0) | ||
826 | /* Controllers set for boot have a *higher* priority */ | ||
827 | return (value); | ||
828 | #endif | ||
829 | |||
830 | value = (lahd->flags & AHD_BIOS_ENABLED) | ||
831 | - (rahd->flags & AHD_BIOS_ENABLED); | ||
832 | if (value != 0) | ||
833 | /* Controllers with BIOS enabled have a *higher* priority */ | ||
834 | return (value); | ||
835 | |||
836 | /* Still equal. Sort by bus/slot/func. */ | ||
837 | if (aic79xx_reverse_scan != 0) | ||
838 | value = ahd_get_pci_bus(lahd->dev_softc) | ||
839 | - ahd_get_pci_bus(rahd->dev_softc); | ||
840 | else | ||
841 | value = ahd_get_pci_bus(rahd->dev_softc) | ||
842 | - ahd_get_pci_bus(lahd->dev_softc); | ||
843 | if (value != 0) | ||
844 | return (value); | ||
845 | if (aic79xx_reverse_scan != 0) | ||
846 | value = ahd_get_pci_slot(lahd->dev_softc) | ||
847 | - ahd_get_pci_slot(rahd->dev_softc); | ||
848 | else | ||
849 | value = ahd_get_pci_slot(rahd->dev_softc) | ||
850 | - ahd_get_pci_slot(lahd->dev_softc); | ||
851 | if (value != 0) | ||
852 | return (value); | ||
853 | |||
854 | value = rahd->channel - lahd->channel; | ||
855 | return (value); | ||
856 | } | ||
857 | |||
858 | static void | 805 | static void |
859 | ahd_linux_setup_iocell_info(u_long index, int instance, int targ, int32_t value) | 806 | ahd_linux_setup_iocell_info(u_long index, int instance, int targ, int32_t value) |
860 | { | 807 | { |
@@ -1596,12 +1543,6 @@ ahd_linux_isr(int irq, void *dev_id, struct pt_regs * regs) | |||
1596 | } | 1543 | } |
1597 | 1544 | ||
1598 | void | 1545 | void |
1599 | ahd_platform_flushwork(struct ahd_softc *ahd) | ||
1600 | { | ||
1601 | |||
1602 | } | ||
1603 | |||
1604 | void | ||
1605 | ahd_send_async(struct ahd_softc *ahd, char channel, | 1546 | ahd_send_async(struct ahd_softc *ahd, char channel, |
1606 | u_int target, u_int lun, ac_code code, void *arg) | 1547 | u_int target, u_int lun, ac_code code, void *arg) |
1607 | { | 1548 | { |
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h index 599e3940db16..2b8331649eeb 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.h +++ b/drivers/scsi/aic7xxx/aic79xx_osm.h | |||
@@ -872,8 +872,6 @@ int ahd_platform_abort_scbs(struct ahd_softc *ahd, int target, | |||
872 | role_t role, uint32_t status); | 872 | role_t role, uint32_t status); |
873 | irqreturn_t | 873 | irqreturn_t |
874 | ahd_linux_isr(int irq, void *dev_id, struct pt_regs * regs); | 874 | ahd_linux_isr(int irq, void *dev_id, struct pt_regs * regs); |
875 | void ahd_platform_flushwork(struct ahd_softc *ahd); | ||
876 | int ahd_softc_comp(struct ahd_softc *, struct ahd_softc *); | ||
877 | void ahd_done(struct ahd_softc*, struct scb*); | 875 | void ahd_done(struct ahd_softc*, struct scb*); |
878 | void ahd_send_async(struct ahd_softc *, char channel, | 876 | void ahd_send_async(struct ahd_softc *, char channel, |
879 | u_int target, u_int lun, ac_code, void *); | 877 | u_int target, u_int lun, ac_code, void *); |