From patchwork Sat Sep 28 01:02:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Lutomirski X-Patchwork-Id: 278696 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EF1882C012E for ; Sat, 28 Sep 2013 11:03:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754629Ab3I1BDP (ORCPT ); Fri, 27 Sep 2013 21:03:15 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:36595 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754478Ab3I1BCw (ORCPT ); Fri, 27 Sep 2013 21:02:52 -0400 Received: by mail-pa0-f52.google.com with SMTP id kl14so3432835pab.25 for ; Fri, 27 Sep 2013 18:02:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=HLGqQfrcn0jono8Mg9ZvrYaxCFFaArqJxfbkpaSAKmU=; b=lBsX7PhDTtV+lB5QluwjVz8TlIa2lZKLfidqrNN7gp/WUAXU8K6bzY77u5/Id24LnD LHE5saXWHp/1dzVS+xcaavd67p3LkZKI8vX0bESKH8zzrhSnJwB/ZVaVzm5B2PkDvHOs rGHn3PiFtk6KQODWgy9+EUgxXUmA1UDiKSzwy9g6ZvW4hpVnoXFD5GFnLngKaj0YrbO8 f5g9Y2J14mvJNxqB+WV4YCq64DWiQVLAvEpUxwyGFlKjSVwJdd+wfWovPRhdC9Oxx37Q bwZPkxtbkZ/9W7J783rj7zVQ3wbXUlbGFAj7MdpnRhBU5S3rsuWjgfGE4ZekdS7HcxKz Nfcg== X-Gm-Message-State: ALoCoQnhEG/WiWc8BBDauH45A6sF4h6n/b34qusq7ke3Vl8IGRgroFu6qAdiB2Q9KGbjicwH5kSk X-Received: by 10.66.230.138 with SMTP id sy10mr14827914pac.103.1380330171495; Fri, 27 Sep 2013 18:02:51 -0700 (PDT) Received: from localhost (50-76-60-73-ip-static.hfc.comcastbusiness.net. [50.76.60.73]) by mx.google.com with ESMTPSA id ye1sm15659112pab.19.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 27 Sep 2013 18:02:50 -0700 (PDT) From: Andy Lutomirski To: Wolfram Sang , linux-i2c@vger.kernel.org Cc: Jean Delvare , Guenter Roeck , linux-kernel@vger.kernel.org, Mauro Carvalho Chehab , Rui Wang , Andy Lutomirski Subject: [PATCH v5 2/4] sb_edac: Claim a different PCI device Date: Fri, 27 Sep 2013 18:02:41 -0700 Message-Id: <5af4ca11ba50a042003de09576cfed9c2ffb105c.1380315959.git.luto@amacapital.net> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org sb_edac controls a large number of different PCI functions. Rather than registering as a normal PCI driver for all of them, it registers for just one so that it gets probed and, at probe time, it looks for all the others. Coincidentally, the device it registers for also contains the SMBUS registers, so the PCI core will refuse to probe both sb_edac and an iMC SMBUS driver. The drivers don't actually conflict, so just change sb_edac's device table to probe a different device. An alternative fix would be to merge the two drivers, but sb_edac will also refuse to load on non-ECC systems, whereas the i2c_imc is still useful without ECC. The only user-visible change should be that sb_edac appears to bind a different device. Cc: Mauro Carvalho Chehab Cc: Rui Wang Signed-off-by: Andy Lutomirski --- drivers/edac/sb_edac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index 4fac6f5..4f30aa7 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -338,7 +338,7 @@ static const struct pci_id_table pci_dev_descr_sbridge_table[] = { * pci_device_id table for which devices we are looking for */ static DEFINE_PCI_DEVICE_TABLE(sbridge_pci_tbl) = { - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_HA0)}, {0,} /* 0 terminated list. */ };