svn commit: r262751 - stable/9/sys/dev/iir

[Jean-Sebastien Pedron]

Author: dumbbell
Date: Tue Mar  4 20:21:43 2014
New Revision: 262751
URL: http://svnweb.freebsd.org/changeset/base/262751

Log:
  MFC r254379:
  
  Avoid potential redefinition of the macro.

Modified:
  stable/9/sys/dev/iir/iir.c
  stable/9/sys/dev/iir/iir.h
  stable/9/sys/dev/iir/iir_ctrl.c
  stable/9/sys/dev/iir/iir_pci.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/iir/iir.c
==============================================================================
--- stable/9/sys/dev/iir/iir.c	Tue Mar  4 20:16:00 2014	(r262750)
+++ stable/9/sys/dev/iir/iir.c	Tue Mar  4 20:21:43 2014	(r262751)
@@ -399,7 +399,7 @@ iir_init(struct gdt_softc *gdt)
 		gdt->oem_name[7]='\0';
 	} else {
 		/* Old method, based on PCI ID */
-		if (gdt->sc_vendor == INTEL_VENDOR_ID)
+		if (gdt->sc_vendor == INTEL_VENDOR_ID_IIR)
             strcpy(gdt->oem_name,"Intel  ");
         else 
        	    strcpy(gdt->oem_name,"ICP    ");
@@ -1374,7 +1374,7 @@ iir_action( struct cam_sim *sim, union c
                   (bus == gdt->sc_virt_bus ? 127 : gdt->sc_bus_id[bus]);
               cpi->base_transfer_speed = 3300;
               strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN);
-              if (gdt->sc_vendor == INTEL_VENDOR_ID)
+              if (gdt->sc_vendor == INTEL_VENDOR_ID_IIR)
                   strncpy(cpi->hba_vid, "Intel Corp.", HBA_IDLEN);
               else
                   strncpy(cpi->hba_vid, "ICP vortex ", HBA_IDLEN);

Modified: stable/9/sys/dev/iir/iir.h
==============================================================================
--- stable/9/sys/dev/iir/iir.h	Tue Mar  4 20:16:00 2014	(r262750)
+++ stable/9/sys/dev/iir/iir.h	Tue Mar  4 20:21:43 2014	(r262751)
@@ -63,7 +63,7 @@
 #define GDT_DEVICE_ID_MAX       0x2ff
 #define GDT_DEVICE_ID_NEWRX     0x300
 
-#define INTEL_VENDOR_ID         0x8086
+#define INTEL_VENDOR_ID_IIR     0x8086
 #define INTEL_DEVICE_ID_IIR     0x600
 
 #define GDT_MAXBUS              6       /* XXX Why not 5? */

Modified: stable/9/sys/dev/iir/iir_ctrl.c
==============================================================================
--- stable/9/sys/dev/iir/iir_ctrl.c	Tue Mar  4 20:16:00 2014	(r262750)
+++ stable/9/sys/dev/iir/iir_ctrl.c	Tue Mar  4 20:21:43 2014	(r262751)
@@ -273,7 +273,7 @@ iir_ioctl(struct cdev *dev, u_long cmd, 
                 return (ENXIO);
             /* only RP controllers */
             p->ext_type = 0x6000 | gdt->sc_device;
-            if (gdt->sc_vendor == INTEL_VENDOR_ID) {
+            if (gdt->sc_vendor == INTEL_VENDOR_ID_IIR) {
                 p->oem_id = OEM_ID_INTEL;
                 p->type = 0xfd;
                 /* new -> subdevice into ext_type */

Modified: stable/9/sys/dev/iir/iir_pci.c
==============================================================================
--- stable/9/sys/dev/iir/iir_pci.c	Tue Mar  4 20:16:00 2014	(r262750)
+++ stable/9/sys/dev/iir/iir_pci.c	Tue Mar  4 20:21:43 2014	(r262751)
@@ -163,7 +163,7 @@ MODULE_DEPEND(iir, cam, 1, 1, 1);
 static int
 iir_pci_probe(device_t dev)
 {
-    if (pci_get_vendor(dev) == INTEL_VENDOR_ID &&
+    if (pci_get_vendor(dev) == INTEL_VENDOR_ID_IIR &&
         pci_get_device(dev) == INTEL_DEVICE_ID_IIR) {
         device_set_desc(dev, "Intel Integrated RAID Controller");
         return (BUS_PROBE_DEFAULT);