From owner-svn-src-all@FreeBSD.ORG Tue Mar 4 20:21:45 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E54E9472; Tue, 4 Mar 2014 20:21:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C5A873F6; Tue, 4 Mar 2014 20:21:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s24KLiZ3094341; Tue, 4 Mar 2014 20:21:44 GMT (envelope-from dumbbell@svn.freebsd.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s24KLhOX094337; Tue, 4 Mar 2014 20:21:43 GMT (envelope-from dumbbell@svn.freebsd.org) Message-Id: <201403042021.s24KLhOX094337@svn.freebsd.org> From: Jean-Sebastien Pedron Date: Tue, 4 Mar 2014 20:21:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r262751 - stable/9/sys/dev/iir X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Mar 2014 20:21:45 -0000 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);