mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Aristeu Rozanski <arozansk@redhat.com>
To: linux-edac@vger.kernel.org
Cc: tony.luck@intel.com, Aristeu Rozanski <arozansk@redhat.com>,
	Mauro Carvalho Chehab <m.chehab@samsung.com>
	(maintainer:EDAC-SBRIDGE),
	Doug Thompson <dougthompson@xmission.com> (supporter:EDAC-CORE),
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 04/12] sb_edac: rename pci_br
Date: Wed, 30 Oct 2013 12:26:58 -0400	[thread overview]
Message-ID: <1383150426-24730-5-git-send-email-arozansk@redhat.com> (raw)
In-Reply-To: <1383150426-24730-1-git-send-email-arozansk@redhat.com>

Ivy Bridge has more than one, so rename pci_br to pci_br0

Signed-off-by: Aristeu Rozanski <arozansk@redhat.com>
---
 drivers/edac/sb_edac.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
index 3e4837f..eb6c9d4 100644
--- a/drivers/edac/sb_edac.c
+++ b/drivers/edac/sb_edac.c
@@ -292,7 +292,7 @@ struct sbridge_dev {
 struct sbridge_pvt {
 	struct pci_dev		*pci_ta, *pci_ddrio, *pci_ras;
 	struct pci_dev		*pci_sad0, *pci_sad1, *pci_ha0;
-	struct pci_dev		*pci_br;
+	struct pci_dev		*pci_br0;
 	struct pci_dev		*pci_tad[NUM_CHANNELS];
 
 	struct sbridge_dev	*sbridge_dev;
@@ -517,10 +517,10 @@ static int get_dimm_config(struct mem_ctl_info *mci)
 
 	pvt->info.rankcfgr = SB_RANK_CFG_A;
 
-	pci_read_config_dword(pvt->pci_br, SAD_TARGET, &reg);
+	pci_read_config_dword(pvt->pci_br0, SAD_TARGET, &reg);
 	pvt->sbridge_dev->source_id = SOURCE_ID(reg);
 
-	pci_read_config_dword(pvt->pci_br, SAD_CONTROL, &reg);
+	pci_read_config_dword(pvt->pci_br0, SAD_CONTROL, &reg);
 	pvt->sbridge_dev->node_id = NODE_ID(reg);
 	edac_dbg(0, "mc#%d: Node ID: %d, source ID: %d\n",
 		 pvt->sbridge_dev->mc,
@@ -1250,7 +1250,7 @@ static int mci_bind_devs(struct mem_ctl_info *mci,
 		case 13:
 			switch (func) {
 			case 6:
-				pvt->pci_br = pdev;
+				pvt->pci_br0 = pdev;
 				break;
 			default:
 				goto error;
-- 
1.7.1


  parent reply	other threads:[~2013-10-30 16:29 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1383150426-24730-1-git-send-email-arozansk@redhat.com>
2013-10-30 16:26 ` [PATCH 01/12] sb_edac: move PCI IDs to pci_ids.h Aristeu Rozanski
2013-10-30 16:40   ` Borislav Petkov
2013-10-30 17:19     ` Mauro Carvalho Chehab
2013-10-30 17:21       ` Bjorn Helgaas
2013-10-30 20:35         ` Aristeu Rozanski
2013-10-30 20:47           ` Mauro Carvalho Chehab
2013-10-30 16:26 ` [PATCH 02/12] sb_edac: make RANK_CFG_A value part of sbridge_info Aristeu Rozanski
2013-10-30 16:26 ` [PATCH 03/12] sb_edac: isolate TOLM retrieval Aristeu Rozanski
2013-10-30 16:26 ` Aristeu Rozanski [this message]
2013-10-30 16:26 ` [PATCH 05/12] sb_edac: isolate TOHM retrieval Aristeu Rozanski
2013-10-30 16:27 ` [PATCH 06/12] sb_edac: allow different dram_rule arrays Aristeu Rozanski
2013-10-30 16:27 ` [PATCH 07/12] sb_edac: allow different interleave lists Aristeu Rozanski
2013-10-30 16:27 ` [PATCH 08/12] sb_edac: rework sad_pkg Aristeu Rozanski
2013-10-30 16:27 ` [PATCH 09/12] sb_edac: enable multiple PCI id tables to be used Aristeu Rozanski
2013-10-30 16:27 ` [PATCH 10/12] sb_edac: rename mci_bind_devs() Aristeu Rozanski
2013-10-30 16:27 ` [PATCH 11/12] sb_edac: avoid decoding the same error multiple times Aristeu Rozanski
2013-10-30 17:21   ` Mauro Carvalho Chehab
2013-10-30 16:27 ` [PATCH 12/12] sb_edac: add support for Ivy Bridge Aristeu Rozanski
2013-10-30 17:25   ` Mauro Carvalho Chehab

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1383150426-24730-5-git-send-email-arozansk@redhat.com \
    --to=arozansk@redhat.com \
    --cc=dougthompson@xmission.com \
    --cc=linux-edac@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=m.chehab@samsung.com \
    --cc=tony.luck@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®