The patch titled EDAC: AMD8111 driver source file v2 has been removed from the -mm tree. Its filename was edac-amd8111-driver-source-file-v2.patch This patch was dropped because it was folded into edac-amd8111-driver-source-file.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: EDAC: AMD8111 driver source file v2 From: Harry Ciao <qingtao.cao@xxxxxxxxxxxxx> Introduce AMD8111 EDAC driver source file, which makes use of error detections on the LPC Bridge Controller and PCI Bridge Controller on the AMD8111 HyperTransport I/O Hub. Signed-off-by: Harry Ciao <qingtao.cao@xxxxxxxxxxxxx> Cc: Doug Thompson <norsk5@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/edac/amd8111_edac.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff -puN drivers/edac/amd8111_edac.c~edac-amd8111-driver-source-file-v2 drivers/edac/amd8111_edac.c --- a/drivers/edac/amd8111_edac.c~edac-amd8111-driver-source-file-v2 +++ a/drivers/edac/amd8111_edac.c @@ -36,6 +36,7 @@ #define AMD8111_EDAC_REVISION " Ver: 1.0.0 " __DATE__ #define AMD8111_EDAC_MOD_STR "amd8111_edac" +#define PCI_DEVICE_ID_AMD_8111_PCI 0x7460 static int edac_dev_idx; enum amd8111_edac_devs { @@ -52,7 +53,7 @@ static int edac_pci_read_dword(struct pc int ret; ret = pci_read_config_dword(dev, reg, val32); - if (ret > 0) + if (ret != 0) printk(KERN_ERR AMD8111_EDAC_MOD_STR " PCI Access Read Error at 0x%x\n", reg); @@ -64,7 +65,7 @@ static void edac_pci_read_byte(struct pc int ret; ret = pci_read_config_byte(dev, reg, val8); - if (ret > 0) + if (ret != 0) printk(KERN_ERR AMD8111_EDAC_MOD_STR " PCI Access Read Error at 0x%x\n", reg); } @@ -74,7 +75,7 @@ static void edac_pci_write_dword(struct int ret; ret = pci_write_config_dword(dev, reg, val32); - if (ret > 0) + if (ret != 0) printk(KERN_ERR AMD8111_EDAC_MOD_STR " PCI Access Write Error at 0x%x\n", reg); } @@ -84,7 +85,7 @@ static void edac_pci_write_byte(struct p int ret; ret = pci_write_config_byte(dev, reg, val8); - if (ret > 0) + if (ret != 0) printk(KERN_ERR AMD8111_EDAC_MOD_STR " PCI Access Write Error at 0x%x\n", reg); } _ Patches currently in -mm which might be from qingtao.cao@xxxxxxxxxxxxx are edac-amd8111-driver-header-file.patch edac-amd8111-driver-header-file-v3.patch edac-amd8111-driver-source-file.patch edac-amd8111-driver-source-file-v2.patch edac-add-edac_pci_alloc_index.patch pci-add-amd8111-pci-bridge-pci-device-id.patch edac-amd8131-driver-header-file.patch edac-amd8131-driver-source-file.patch edac-amd8131-driver-source-file-v2.patch edac-amd8131-driver-kconfig-makefile.patch edac-amd8111-driver-kconfig-makefile.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html