From owner-freebsd-current@FreeBSD.ORG Tue Aug 9 20:38:05 2011 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9994C1065670 for ; Tue, 9 Aug 2011 20:38:05 +0000 (UTC) (envelope-from pawel.worach@gmail.com) Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54]) by mx1.freebsd.org (Postfix) with ESMTP id 303258FC0C for ; Tue, 9 Aug 2011 20:38:04 +0000 (UTC) Received: by fxe4 with SMTP id 4so531064fxe.13 for ; Tue, 09 Aug 2011 13:38:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:content-type:content-transfer-encoding:subject:date:message-id :to:mime-version:x-mailer; bh=sySIe6mB/K45MCqQwhOKZIi/ulCiunFWtAqbf5WmaNA=; b=aTTdw/vfC9yP3xdzAvpN+jfS9BE4IpA97PUsFkfPexACKz2KM4IBvS9bbthe/z6JTD bR/aaIfkWoLM3ShNSqY80IbMP7ql6n7G/Fh6LHAf40ixT4/Jq26xGAhuFsTo07BbEl1X zpDQ1LRnXRRSyL12hk0nPTp+eA9oJzUbQszfU= Received: by 10.204.151.27 with SMTP id a27mr860972bkw.355.1312922284021; Tue, 09 Aug 2011 13:38:04 -0700 (PDT) Received: from [172.16.0.199] (host-78-64-61-68.homerun.telia.com [78.64.61.68]) by mx.google.com with ESMTPS id d10sm37955bkt.60.2011.08.09.13.38.01 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 09 Aug 2011 13:38:02 -0700 (PDT) From: Pawel Worach Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Date: Tue, 9 Aug 2011 22:37:59 +0200 Message-Id: <2090B3FF-F932-4943-99FB-B763400CA57B@gmail.com> To: current@freebsd.org Mime-Version: 1.0 (Apple Message framework v1244.3) X-Mailer: Apple Mail (2.1244.3) Cc: Subject: [patch] fix duplicate case value in ichsmb_pci.c X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2011 20:38:05 -0000 Hi, clang trunk has yet another nice error (in this case harmless): dev/ichsmb/ichsmb_pci.c:183:7: error: duplicate case value '590381190' case ID_DH89XXCC: ^ dev/ichsmb/ichsmb_pci.c:85:23: note: expanded from: #define ID_DH89XXCC 0x23308086 ^ dev/ichsmb/ichsmb_pci.c:173:7: note: previous case defined here case ID_PCH_DH89XXCC: ^ dev/ichsmb/ichsmb_pci.c:70:27: note: expanded from: #define ID_PCH_DH89XXCC 0x23308086 ^ 1 error generated. Fix (there is a more specific device_set_desc() for the 0x23308086 = controller which is also called ID_DH89XXCC in another case): Index: sys/dev/ichsmb/ichsmb_pci.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sys/dev/ichsmb/ichsmb_pci.c (revision 224736) +++ sys/dev/ichsmb/ichsmb_pci.c (working copy) @@ -67,7 +67,6 @@ #include =20 /* PCI unique identifiers */ -#define ID_PCH_DH89XXCC 0x23308086 #define ID_82801AA 0x24138086 #define ID_82801AB 0x24238086 #define ID_82801BA 0x24438086 @@ -170,7 +169,6 @@ case ID_82801JI: device_set_desc(dev, "Intel 82801JI (ICH10) SMBus = controller"); break; - case ID_PCH_DH89XXCC: case ID_PCH: device_set_desc(dev, "Intel PCH SMBus controller"); break; --=20 Pawel