linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / scsi / aic7xxx / aic7xxx_pci.c

diff --git a/drivers/scsi/aic7xxx/aic7xxx_pci.c b/drivers/scsi/aic7xxx/aic7xxx_pci.c
index 63cab2d..5f58614 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_pci.c
@@ -144,22 +144,16 @@ static ahc_device_setup_t ahc_aic785X_setup;
 static ahc_device_setup_t ahc_aic7860_setup;
 static ahc_device_setup_t ahc_apa1480_setup;
 static ahc_device_setup_t ahc_aic7870_setup;
-static ahc_device_setup_t ahc_aic7870h_setup;
 static ahc_device_setup_t ahc_aha394X_setup;
-static ahc_device_setup_t ahc_aha394Xh_setup;
 static ahc_device_setup_t ahc_aha494X_setup;
-static ahc_device_setup_t ahc_aha494Xh_setup;
 static ahc_device_setup_t ahc_aha398X_setup;
 static ahc_device_setup_t ahc_aic7880_setup;
-static ahc_device_setup_t ahc_aic7880h_setup;
 static ahc_device_setup_t ahc_aha2940Pro_setup;
 static ahc_device_setup_t ahc_aha394XU_setup;
-static ahc_device_setup_t ahc_aha394XUh_setup;
 static ahc_device_setup_t ahc_aha398XU_setup;
 static ahc_device_setup_t ahc_aic7890_setup;
 static ahc_device_setup_t ahc_aic7892_setup;
 static ahc_device_setup_t ahc_aic7895_setup;
-static ahc_device_setup_t ahc_aic7895h_setup;
 static ahc_device_setup_t ahc_aic7896_setup;
 static ahc_device_setup_t ahc_aic7899_setup;
 static ahc_device_setup_t ahc_aha29160C_setup;
@@ -231,19 +225,19 @@ struct ahc_pci_identity ahc_pci_ident_table [] =
                ID_AHA_2944,
                ID_ALL_MASK,
                "Adaptec 2944 SCSI adapter",
-               ahc_aic7870h_setup
+               ahc_aic7870_setup
        },
        {
                ID_AHA_3944,
                ID_ALL_MASK,
                "Adaptec 3944 SCSI adapter",
-               ahc_aha394Xh_setup
+               ahc_aha394X_setup
        },
        {
                ID_AHA_4944,
                ID_ALL_MASK,
                "Adaptec 4944 SCSI adapter",
-               ahc_aha494Xh_setup
+               ahc_aha494X_setup
        },
        /* aic7880 based controllers */
        {
@@ -262,13 +256,13 @@ struct ahc_pci_identity ahc_pci_ident_table [] =
                ID_AHA_2944U & ID_DEV_VENDOR_MASK,
                ID_DEV_VENDOR_MASK,
                "Adaptec 2944 Ultra SCSI adapter",
-               ahc_aic7880h_setup
+               ahc_aic7880_setup
        },
        {
                ID_AHA_3944U & ID_DEV_VENDOR_MASK,
                ID_DEV_VENDOR_MASK,
                "Adaptec 3944 Ultra SCSI adapter",
-               ahc_aha394XUh_setup
+               ahc_aha394XU_setup
        },
        {
                ID_AHA_398XU & ID_DEV_VENDOR_MASK,
@@ -284,7 +278,7 @@ struct ahc_pci_identity ahc_pci_ident_table [] =
                ID_AHA_4944U & ID_DEV_VENDOR_MASK,
                ID_DEV_VENDOR_MASK,
                "Adaptec 4944 Ultra SCSI adapter",
-               ahc_aic7880h_setup
+               ahc_aic7880_setup
        },
        {
                ID_AHA_2930U & ID_DEV_VENDOR_MASK,
@@ -420,7 +414,7 @@ struct ahc_pci_identity ahc_pci_ident_table [] =
                ID_AHA_3944AU,
                ID_ALL_MASK,
                "Adaptec 3944A Ultra SCSI adapter",
-               ahc_aic7895h_setup
+               ahc_aic7895_setup
        },
        {
                ID_AIC7895_ARO,
@@ -559,7 +553,7 @@ struct ahc_pci_identity ahc_pci_ident_table [] =
        }
 };
 
-const u_int ahc_num_pci_devs = ARRAY_SIZE(ahc_pci_ident_table);
+const u_int ahc_num_pci_devs = NUM_ELEMENTS(ahc_pci_ident_table);
                
 #define AHC_394X_SLOT_CHANNEL_A        4
 #define AHC_394X_SLOT_CHANNEL_B        5
@@ -2042,12 +2036,12 @@ ahc_pci_resume(struct ahc_softc *ahc)
         * that the OS doesn't know about and rely on our chip
         * reset handler to handle the rest.
         */
-       ahc_pci_write_config(ahc->dev_softc, DEVCONFIG,
-                            ahc->bus_softc.pci_softc.devconfig, /*bytes*/4);
-       ahc_pci_write_config(ahc->dev_softc, PCIR_COMMAND,
-                            ahc->bus_softc.pci_softc.command, /*bytes*/1);
-       ahc_pci_write_config(ahc->dev_softc, CSIZE_LATTIME,
-                            ahc->bus_softc.pci_softc.csize_lattime, /*bytes*/1);
+       ahc_pci_write_config(ahc->dev_softc, DEVCONFIG, /*bytes*/4,
+                            ahc->bus_softc.pci_softc.devconfig);
+       ahc_pci_write_config(ahc->dev_softc, PCIR_COMMAND, /*bytes*/1,
+                            ahc->bus_softc.pci_softc.command);
+       ahc_pci_write_config(ahc->dev_softc, CSIZE_LATTIME, /*bytes*/1,
+                            ahc->bus_softc.pci_softc.csize_lattime);
        if ((ahc->flags & AHC_HAS_TERM_LOGIC) != 0) {
                struct  seeprom_descriptor sd;
                u_int   sxfrctl1;
@@ -2126,16 +2120,6 @@ ahc_aic7870_setup(struct ahc_softc *ahc)
        return (0);
 }
 
-static int
-ahc_aic7870h_setup(struct ahc_softc *ahc)
-{
-       int error = ahc_aic7870_setup(ahc);
-
-       ahc->features |= AHC_HVD;
-
-       return error;
-}
-
 static int
 ahc_aha394X_setup(struct ahc_softc *ahc)
 {
@@ -2147,16 +2131,6 @@ ahc_aha394X_setup(struct ahc_softc *ahc)
        return (error);
 }
 
-static int
-ahc_aha394Xh_setup(struct ahc_softc *ahc)
-{
-       int error = ahc_aha394X_setup(ahc);
-
-       ahc->features |= AHC_HVD;
-
-       return error;
-}
-
 static int
 ahc_aha398X_setup(struct ahc_softc *ahc)
 {
@@ -2179,16 +2153,6 @@ ahc_aha494X_setup(struct ahc_softc *ahc)
        return (error);
 }
 
-static int
-ahc_aha494Xh_setup(struct ahc_softc *ahc)
-{
-       int error = ahc_aha494X_setup(ahc);
-
-       ahc->features |= AHC_HVD;
-
-       return error;
-}
-
 static int
 ahc_aic7880_setup(struct ahc_softc *ahc)
 {
@@ -2210,17 +2174,6 @@ ahc_aic7880_setup(struct ahc_softc *ahc)
        return (0);
 }
 
-static int
-ahc_aic7880h_setup(struct ahc_softc *ahc)
-{
-       int error = ahc_aic7880_setup(ahc);
-
-       ahc->features |= AHC_HVD;
-
-       return error;
-}
-
-
 static int
 ahc_aha2940Pro_setup(struct ahc_softc *ahc)
 {
@@ -2240,16 +2193,6 @@ ahc_aha394XU_setup(struct ahc_softc *ahc)
        return (error);
 }
 
-static int
-ahc_aha394XUh_setup(struct ahc_softc *ahc)
-{
-       int error = ahc_aha394XU_setup(ahc);
-
-       ahc->features |= AHC_HVD;
-
-       return error;
-}
-
 static int
 ahc_aha398XU_setup(struct ahc_softc *ahc)
 {
@@ -2348,16 +2291,6 @@ ahc_aic7895_setup(struct ahc_softc *ahc)
        return (0);
 }
 
-static int
-ahc_aic7895h_setup(struct ahc_softc *ahc)
-{
-       int error = ahc_aic7895_setup(ahc);
-
-       ahc->features |= AHC_HVD;
-
-       return error;
-}
-
 static int
 ahc_aic7896_setup(struct ahc_softc *ahc)
 {