Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / drivers / scsi / aic7xxx / aic79xx_pci.c

diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
index 14850f31aafa53cdafd3817936a7d6b22906613a..0bada0028aa0ba0c2081f79c4bdc99477754f6bc 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
@@ -88,7 +88,7 @@ ahd_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor)
 
 #define SUBID_9005_LEGACYCONN_FUNC(id) ((id) & 0x20)
 
-#define SUBID_9005_SEEPTYPE(id) ((id) & 0x0C0) >> 6)
+#define SUBID_9005_SEEPTYPE(id) (((id) & 0x0C0) >> 6)
 #define                SUBID_9005_SEEPTYPE_NONE        0x0
 #define                SUBID_9005_SEEPTYPE_4K          0x1
 
@@ -97,7 +97,7 @@ static ahd_device_setup_t ahd_aic7901A_setup;
 static ahd_device_setup_t ahd_aic7902_setup;
 static ahd_device_setup_t ahd_aic790X_setup;
 
-struct ahd_pci_identity ahd_pci_ident_table [] =
+static struct ahd_pci_identity ahd_pci_ident_table [] =
 {
        /* aic7901 based controllers */
        {
@@ -109,7 +109,13 @@ struct ahd_pci_identity ahd_pci_ident_table [] =
        {
                ID_AHA_29320ALP,
                ID_ALL_MASK,
-               "Adaptec 29320ALP Ultra320 SCSI adapter",
+               "Adaptec 29320ALP PCIx Ultra320 SCSI adapter",
+               ahd_aic7901_setup
+       },
+       {
+               ID_AHA_29320LPE,
+               ID_ALL_MASK,
+               "Adaptec 29320LPE PCIe Ultra320 SCSI adapter",
                ahd_aic7901_setup
        },
        /* aic7901A based controllers */
@@ -201,7 +207,7 @@ struct ahd_pci_identity ahd_pci_ident_table [] =
        }
 };
 
-const u_int ahd_num_pci_devs = ARRAY_SIZE(ahd_pci_ident_table);
+static const u_int ahd_num_pci_devs = ARRAY_SIZE(ahd_pci_ident_table);
                
 #define        DEVCONFIG               0x40
 #define                PCIXINITPAT     0x0000E000ul
@@ -245,6 +251,7 @@ static int  ahd_check_extport(struct ahd_softc *ahd);
 static void    ahd_configure_termination(struct ahd_softc *ahd,
                                          u_int adapter_control);
 static void    ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat);
+static void    ahd_pci_intr(struct ahd_softc *ahd);
 
 struct ahd_pci_identity *
 ahd_find_pci_device(ahd_dev_softc_t pci)
@@ -757,7 +764,7 @@ static const char *pci_status_strings[] =
        "%s: Address or Write Phase Parity Error Detected in %s.\n"
 };
 
-void
+static void
 ahd_pci_intr(struct ahd_softc *ahd)
 {
        uint8_t         pci_status[8];
@@ -959,7 +966,7 @@ ahd_aic790X_setup(struct ahd_softc *ahd)
                              |  AHD_BUSFREEREV_BUG;
                ahd->bugs |= AHD_LQOOVERRUN_BUG|AHD_EARLY_REQ_BUG;
 
-               /* If the user requested the the SLOWCRC bit to be set. */
+               /* If the user requested that the SLOWCRC bit to be set. */
                if (aic79xx_slowcrc)
                        ahd->features |= AHD_AIC79XXB_SLOWCRC;