[v1 PATCH 0/2] EDAC: AMD8111 & AMD8131 Kconfig fixup

[v1 PATCH 0/2] EDAC: AMD8111 & AMD8131 Kconfig fixup

[Harry Ciao]

Hi Doug and Andrew,

These are two minor fixups for the AMD8111 and AMD8131 EDAC drivers.
The direct reference to device.bus_id should be replaced by dev_name().

Add their missing Makefile entires and introduce machine dependency to 
their Kconfig options in order to avoid the allmodconfig failure, which
I have no better idea to avoid although these chips are not specific to
Maple.

Best regards,

Harry

[v1 PATCH 1/2] EDAC: AMD8111 & AMD8131 use dev_name()

[Harry Ciao]

The "bus_id" member in the device structure has been obsolete,
use dev_name() instead.

Signed-off-by: Harry Ciao <qingtao.cao@windriver.com>
---
 drivers/edac/amd8111_edac.c |    4 ++--
 drivers/edac/amd8131_edac.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/edac/amd8111_edac.c b/drivers/edac/amd8111_edac.c
index 6146921..2cb58ef 100644
--- a/drivers/edac/amd8111_edac.c
+++ b/drivers/edac/amd8111_edac.c
@@ -389,7 +389,7 @@ static int amd8111_dev_probe(struct pci_dev *dev,
 	dev_info->edac_dev->dev = &dev_info->dev->dev;
 	dev_info->edac_dev->mod_name = AMD8111_EDAC_MOD_STR;
 	dev_info->edac_dev->ctl_name = dev_info->ctl_name;
-	dev_info->edac_dev->dev_name = dev_info->dev->dev.bus_id;
+	dev_info->edac_dev->dev_name = dev_name(&dev_info->dev->dev);
 
 	if (edac_op_state == EDAC_OPSTATE_POLL)
 		dev_info->edac_dev->edac_check = dev_info->check;
@@ -473,7 +473,7 @@ static int amd8111_pci_probe(struct pci_dev *dev,
 	pci_info->edac_dev->dev = &pci_info->dev->dev;
 	pci_info->edac_dev->mod_name = AMD8111_EDAC_MOD_STR;
 	pci_info->edac_dev->ctl_name = pci_info->ctl_name;
-	pci_info->edac_dev->dev_name = pci_info->dev->dev.bus_id;
+	pci_info->edac_dev->dev_name = dev_name(&pci_info->dev->dev);
 
 	if (edac_op_state == EDAC_OPSTATE_POLL)
 		pci_info->edac_dev->edac_check = pci_info->check;
diff --git a/drivers/edac/amd8131_edac.c b/drivers/edac/amd8131_edac.c
index c083b31..b432d60 100644
--- a/drivers/edac/amd8131_edac.c
+++ b/drivers/edac/amd8131_edac.c
@@ -287,7 +287,7 @@ static int amd8131_probe(struct pci_dev *dev, const struct pci_device_id *id)
 	dev_info->edac_dev->dev = &dev_info->dev->dev;
 	dev_info->edac_dev->mod_name = AMD8131_EDAC_MOD_STR;
 	dev_info->edac_dev->ctl_name = dev_info->ctl_name;
-	dev_info->edac_dev->dev_name = dev_info->dev->dev.bus_id;
+	dev_info->edac_dev->dev_name = dev_name(&dev_info->dev->dev);
 
 	if (edac_op_state == EDAC_OPSTATE_POLL)
 		dev_info->edac_dev->edac_check = amd8131_chipset.check;
-- 
1.5.6.2

[v1 PATCH 2/2] EDAC: AMD8111 & AMD8131 Kconfig fixup

[Harry Ciao]

The amd8111_edac.c driver will fail allmodconfig on architectures
other than PPC, introduce Kconfig dependency to avoid this, since
both AMD8111 and AMD8131 chips are only adopted on Maple so far.

Signed-off-by: Harry Ciao <qingtao.cao@windriver.com>
---
 drivers/edac/Kconfig  |    8 ++++++--
 drivers/edac/Makefile |    2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index d9a7c25..376a9a4 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -192,17 +192,21 @@ config EDAC_PPC4XX
 
 config EDAC_AMD8131
 	tristate "AMD8131 HyperTransport PCI-X Tunnel"
-	depends on EDAC_MM_EDAC && PCI
+	depends on EDAC_MM_EDAC && PCI && PPC_MAPLE
 	help
 	  Support for error detection and correction on the
 	  AMD8131 HyperTransport PCI-X Tunnel chip.
+	  Note, add more Kconfig dependency if it's adopted
+	  on some machine other than Maple.
 
 config EDAC_AMD8111
 	tristate "AMD8111 HyperTransport I/O Hub"
-	depends on EDAC_MM_EDAC && PCI
+	depends on EDAC_MM_EDAC && PCI && PPC_MAPLE
 	help
 	  Support for error detection and correction on the
 	  AMD8111 HyperTransport I/O Hub chip.
+	  Note, add more Kconfig dependency if it's adopted
+	  on some machine other than Maple.
 
 config EDAC_CPC925
 	tristate "IBM CPC925 Memory Controller (PPC970FX)"
diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile
index ddfd072..be0e705 100644
--- a/drivers/edac/Makefile
+++ b/drivers/edac/Makefile
@@ -36,3 +36,5 @@ obj-$(CONFIG_EDAC_MPC85XX)		+= mpc85xx_edac.o
 obj-$(CONFIG_EDAC_MV64X60)		+= mv64x60_edac.o
 obj-$(CONFIG_EDAC_CELL)			+= cell_edac.o
 obj-$(CONFIG_EDAC_PPC4XX)		+= ppc4xx_edac.o
+obj-$(CONFIG_EDAC_AMD8111)		+= amd8111_edac.o
+obj-$(CONFIG_EDAC_AMD8131)		+= amd8131_edac.o
-- 
1.5.6.2

Re: [v1 PATCH 0/2] EDAC: AMD8111 & AMD8131 Kconfig fixup

[Andrew Morton]

On Fri, 15 May 2009 11:26:44 +0800 Harry Ciao <qingtao.cao@windriver.com> wrote:

> These are two minor fixups for the AMD8111 and AMD8131 EDAC drivers.
> The direct reference to device.bus_id should be replaced by dev_name().
> 
> Add their missing Makefile entires and introduce machine dependency to 
> their Kconfig options in order to avoid the allmodconfig failure, which
> I have no better idea to avoid although these chips are not specific to
> Maple.

OK, thanks.

Do you think these fixes are safe and desirable for 2.6.30?  (I do).

Re: [v1 PATCH 0/2] EDAC: AMD8111 & AMD8131 Kconfig fixup

[Harry Ciao]

Andrew Morton wrote:
> On Fri, 15 May 2009 11:26:44 +0800 Harry Ciao <qingtao.cao@windriver.com> wrote:
>
>   
>> These are two minor fixups for the AMD8111 and AMD8131 EDAC drivers.
>> The direct reference to device.bus_id should be replaced by dev_name().
>>
>> Add their missing Makefile entires and introduce machine dependency to 
>> their Kconfig options in order to avoid the allmodconfig failure, which
>> I have no better idea to avoid although these chips are not specific to
>> Maple.
>>     
>
> OK, thanks.
>
> Do you think these fixes are safe and desirable for 2.6.30?  (I do).
>
>   
Hi Andrew,

Yes I think so too, I have tested these patches and they work well.

Thanks!

Harry