Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
1 年多 前同步成功

通知 160
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 9b3c6e85 编写于 作者: G Greg Kroah-Hartman
浏览文件
操作

Drivers: edac: remove __dev* attributes. 

CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, and __devexit
from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Doug Thompson <dougthompson@xmission.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Mark Gross <mark.gross@intel.com>
Cc: Jason Uhlenkott <juhlenko@akamai.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Tim Small <tim@buttersideup.com>
Cc: Ranganathan Desikan <ravi@jetztechnologies.com>
Cc: "Arvind R." <arvino55@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: David Daney <david.daney@cavium.com>
Cc: Egor Martovetsky <egor@pasemi.com>
Cc: Olof Johansson <olof@lixom.net>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 312facaf
隐藏空白更改
内联 并排
Showing with 111 addition and 128 deletion
drivers/edac/amd64_edac.c
浏览文件 @ 9b3c6e85
...@@ -2563,8 +2563,8 @@ static int amd64_init_one_instance(struct pci_dev *F2) ...@@ -2563,8 +2563,8 @@ static int amd64_init_one_instance(struct pci_dev *F2)
return ret; return ret;
} }
static int __devinit amd64_probe_one_instance(struct pci_dev *pdev, static int amd64_probe_one_instance(struct pci_dev *pdev,
const struct pci_device_id *mc_type) const struct pci_device_id *mc_type)
{ {
u8 nid = get_node_id(pdev); u8 nid = get_node_id(pdev);
struct pci_dev *F3 = node_to_amd_nb(nid)->misc; struct pci_dev *F3 = node_to_amd_nb(nid)->misc;
...@@ -2612,7 +2612,7 @@ static int __devinit amd64_probe_one_instance(struct pci_dev *pdev, ...@@ -2612,7 +2612,7 @@ static int __devinit amd64_probe_one_instance(struct pci_dev *pdev,
return ret; return ret;
} }
static void __devexit amd64_remove_one_instance(struct pci_dev *pdev) static void amd64_remove_one_instance(struct pci_dev *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
struct amd64_pvt *pvt; struct amd64_pvt *pvt;
...@@ -2686,7 +2686,7 @@ MODULE_DEVICE_TABLE(pci, amd64_pci_table); ...@@ -2686,7 +2686,7 @@ MODULE_DEVICE_TABLE(pci, amd64_pci_table);
static struct pci_driver amd64_pci_driver = { static struct pci_driver amd64_pci_driver = {
.name = EDAC_MOD_STR, .name = EDAC_MOD_STR,
.probe = amd64_probe_one_instance, .probe = amd64_probe_one_instance,
.remove = __devexit_p(amd64_remove_one_instance), .remove = amd64_remove_one_instance,
.id_table = amd64_pci_table, .id_table = amd64_pci_table,
}; };
......
drivers/edac/amd76x_edac.c
浏览文件 @ 9b3c6e85
...@@ -301,8 +301,8 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) ...@@ -301,8 +301,8 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx)
} }
/* returns count (>= 0), or negative on error */ /* returns count (>= 0), or negative on error */
static int __devinit amd76x_init_one(struct pci_dev *pdev, static int amd76x_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
edac_dbg(0, "\n"); edac_dbg(0, "\n");
...@@ -318,7 +318,7 @@ static int __devinit amd76x_init_one(struct pci_dev *pdev, ...@@ -318,7 +318,7 @@ static int __devinit amd76x_init_one(struct pci_dev *pdev,
* structure for the device then delete the mci and free the * structure for the device then delete the mci and free the
* resources. * resources.
*/ */
static void __devexit amd76x_remove_one(struct pci_dev *pdev) static void amd76x_remove_one(struct pci_dev *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
...@@ -350,7 +350,7 @@ MODULE_DEVICE_TABLE(pci, amd76x_pci_tbl); ...@@ -350,7 +350,7 @@ MODULE_DEVICE_TABLE(pci, amd76x_pci_tbl);
static struct pci_driver amd76x_driver = { static struct pci_driver amd76x_driver = {
.name = EDAC_MOD_STR, .name = EDAC_MOD_STR,
.probe = amd76x_init_one, .probe = amd76x_init_one,
.remove = __devexit_p(amd76x_remove_one), .remove = amd76x_remove_one,
.id_table = amd76x_pci_tbl, .id_table = amd76x_pci_tbl,
}; };
......
drivers/edac/cell_edac.c
浏览文件 @ 9b3c6e85
...@@ -124,7 +124,7 @@ static void cell_edac_check(struct mem_ctl_info *mci) ...@@ -124,7 +124,7 @@ static void cell_edac_check(struct mem_ctl_info *mci)
} }
} }
static void __devinit cell_edac_init_csrows(struct mem_ctl_info *mci) static void cell_edac_init_csrows(struct mem_ctl_info *mci)
{ {
struct csrow_info *csrow = mci->csrows[0]; struct csrow_info *csrow = mci->csrows[0];
struct dimm_info *dimm; struct dimm_info *dimm;
...@@ -164,7 +164,7 @@ static void __devinit cell_edac_init_csrows(struct mem_ctl_info *mci) ...@@ -164,7 +164,7 @@ static void __devinit cell_edac_init_csrows(struct mem_ctl_info *mci)
} }
} }
static int __devinit cell_edac_probe(struct platform_device *pdev) static int cell_edac_probe(struct platform_device *pdev)
{ {
struct cbe_mic_tm_regs __iomem *regs; struct cbe_mic_tm_regs __iomem *regs;
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
...@@ -233,7 +233,7 @@ static int __devinit cell_edac_probe(struct platform_device *pdev) ...@@ -233,7 +233,7 @@ static int __devinit cell_edac_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit cell_edac_remove(struct platform_device *pdev) static int cell_edac_remove(struct platform_device *pdev)
{ {
struct mem_ctl_info *mci = edac_mc_del_mc(&pdev->dev); struct mem_ctl_info *mci = edac_mc_del_mc(&pdev->dev);
if (mci) if (mci)
...@@ -247,7 +247,7 @@ static struct platform_driver cell_edac_driver = { ...@@ -247,7 +247,7 @@ static struct platform_driver cell_edac_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = cell_edac_probe, .probe = cell_edac_probe,
.remove = __devexit_p(cell_edac_remove), .remove = cell_edac_remove,
}; };
static int __init cell_edac_init(void) static int __init cell_edac_init(void)
......
drivers/edac/cpc925_edac.c
浏览文件 @ 9b3c6e85
...@@ -932,7 +932,7 @@ static int cpc925_mc_get_channels(void __iomem *vbase) ...@@ -932,7 +932,7 @@ static int cpc925_mc_get_channels(void __iomem *vbase)
return dual; return dual;
} }
static int __devinit cpc925_probe(struct platform_device *pdev) static int cpc925_probe(struct platform_device *pdev)
{ {
static int edac_mc_idx; static int edac_mc_idx;
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
......
drivers/edac/e752x_edac.c
浏览文件 @ 9b3c6e85
...@@ -1390,8 +1390,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) ...@@ -1390,8 +1390,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx)
} }
/* returns count (>= 0), or negative on error */ /* returns count (>= 0), or negative on error */
static int __devinit e752x_init_one(struct pci_dev *pdev, static int e752x_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
edac_dbg(0, "\n"); edac_dbg(0, "\n");
...@@ -1402,7 +1401,7 @@ static int __devinit e752x_init_one(struct pci_dev *pdev, ...@@ -1402,7 +1401,7 @@ static int __devinit e752x_init_one(struct pci_dev *pdev,
return e752x_probe1(pdev, ent->driver_data); return e752x_probe1(pdev, ent->driver_data);
} }
static void __devexit e752x_remove_one(struct pci_dev *pdev) static void e752x_remove_one(struct pci_dev *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
struct e752x_pvt *pvt; struct e752x_pvt *pvt;
...@@ -1445,7 +1444,7 @@ MODULE_DEVICE_TABLE(pci, e752x_pci_tbl); ...@@ -1445,7 +1444,7 @@ MODULE_DEVICE_TABLE(pci, e752x_pci_tbl);
static struct pci_driver e752x_driver = { static struct pci_driver e752x_driver = {
.name = EDAC_MOD_STR, .name = EDAC_MOD_STR,
.probe = e752x_init_one, .probe = e752x_init_one,
.remove = __devexit_p(e752x_remove_one), .remove = e752x_remove_one,
.id_table = e752x_pci_tbl, .id_table = e752x_pci_tbl,
}; };
......
drivers/edac/e7xxx_edac.c
浏览文件 @ 9b3c6e85
...@@ -528,8 +528,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) ...@@ -528,8 +528,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx)
} }
/* returns count (>= 0), or negative on error */ /* returns count (>= 0), or negative on error */
static int __devinit e7xxx_init_one(struct pci_dev *pdev, static int e7xxx_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
edac_dbg(0, "\n"); edac_dbg(0, "\n");
...@@ -538,7 +537,7 @@ static int __devinit e7xxx_init_one(struct pci_dev *pdev, ...@@ -538,7 +537,7 @@ static int __devinit e7xxx_init_one(struct pci_dev *pdev,
-EIO : e7xxx_probe1(pdev, ent->driver_data); -EIO : e7xxx_probe1(pdev, ent->driver_data);
} }
static void __devexit e7xxx_remove_one(struct pci_dev *pdev) static void e7xxx_remove_one(struct pci_dev *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
struct e7xxx_pvt *pvt; struct e7xxx_pvt *pvt;
...@@ -579,7 +578,7 @@ MODULE_DEVICE_TABLE(pci, e7xxx_pci_tbl); ...@@ -579,7 +578,7 @@ MODULE_DEVICE_TABLE(pci, e7xxx_pci_tbl);
static struct pci_driver e7xxx_driver = { static struct pci_driver e7xxx_driver = {
.name = EDAC_MOD_STR, .name = EDAC_MOD_STR,
.probe = e7xxx_init_one, .probe = e7xxx_init_one,
.remove = __devexit_p(e7xxx_remove_one), .remove = e7xxx_remove_one,
.id_table = e7xxx_pci_tbl, .id_table = e7xxx_pci_tbl,
}; };
......
drivers/edac/highbank_l2_edac.c
浏览文件 @ 9b3c6e85
...@@ -50,7 +50,7 @@ static irqreturn_t highbank_l2_err_handler(int irq, void *dev_id) ...@@ -50,7 +50,7 @@ static irqreturn_t highbank_l2_err_handler(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit highbank_l2_err_probe(struct platform_device *pdev) static int highbank_l2_err_probe(struct platform_device *pdev)
{ {
struct edac_device_ctl_info *dci; struct edac_device_ctl_info *dci;
struct hb_l2_drvdata *drvdata; struct hb_l2_drvdata *drvdata;
......
drivers/edac/highbank_mc_edac.c
浏览文件 @ 9b3c6e85
...@@ -119,7 +119,7 @@ static const struct file_operations highbank_mc_debug_inject_fops = { ...@@ -119,7 +119,7 @@ static const struct file_operations highbank_mc_debug_inject_fops = {
.llseek = generic_file_llseek, .llseek = generic_file_llseek,
}; };
static void __devinit highbank_mc_create_debugfs_nodes(struct mem_ctl_info *mci) static void highbank_mc_create_debugfs_nodes(struct mem_ctl_info *mci)
{ {
if (mci->debugfs) if (mci->debugfs)
debugfs_create_file("inject_ctrl", S_IWUSR, mci->debugfs, mci, debugfs_create_file("inject_ctrl", S_IWUSR, mci->debugfs, mci,
...@@ -127,11 +127,11 @@ static void __devinit highbank_mc_create_debugfs_nodes(struct mem_ctl_info *mci) ...@@ -127,11 +127,11 @@ static void __devinit highbank_mc_create_debugfs_nodes(struct mem_ctl_info *mci)
; ;
} }
#else #else
static void __devinit highbank_mc_create_debugfs_nodes(struct mem_ctl_info *mci) static void highbank_mc_create_debugfs_nodes(struct mem_ctl_info *mci)
{} {}
#endif #endif
static int __devinit highbank_mc_probe(struct platform_device *pdev) static int highbank_mc_probe(struct platform_device *pdev)
{ {
struct edac_mc_layer layers[2]; struct edac_mc_layer layers[2];
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
......
drivers/edac/i3000_edac.c
浏览文件 @ 9b3c6e85
...@@ -455,8 +455,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx) ...@@ -455,8 +455,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
} }
/* returns count (>= 0), or negative on error */ /* returns count (>= 0), or negative on error */
static int __devinit i3000_init_one(struct pci_dev *pdev, static int i3000_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
int rc; int rc;
...@@ -472,7 +471,7 @@ static int __devinit i3000_init_one(struct pci_dev *pdev, ...@@ -472,7 +471,7 @@ static int __devinit i3000_init_one(struct pci_dev *pdev,
return rc; return rc;
} }
static void __devexit i3000_remove_one(struct pci_dev *pdev) static void i3000_remove_one(struct pci_dev *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
...@@ -502,7 +501,7 @@ MODULE_DEVICE_TABLE(pci, i3000_pci_tbl); ...@@ -502,7 +501,7 @@ MODULE_DEVICE_TABLE(pci, i3000_pci_tbl);
static struct pci_driver i3000_driver = { static struct pci_driver i3000_driver = {
.name = EDAC_MOD_STR, .name = EDAC_MOD_STR,
.probe = i3000_init_one, .probe = i3000_init_one,
.remove = __devexit_p(i3000_remove_one), .remove = i3000_remove_one,
.id_table = i3000_pci_tbl, .id_table = i3000_pci_tbl,
}; };
......
drivers/edac/i3200_edac.c
浏览文件 @ 9b3c6e85
...@@ -419,8 +419,7 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx) ...@@ -419,8 +419,7 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx)
return rc; return rc;
} }
static int __devinit i3200_init_one(struct pci_dev *pdev, static int i3200_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
int rc; int rc;
...@@ -436,7 +435,7 @@ static int __devinit i3200_init_one(struct pci_dev *pdev, ...@@ -436,7 +435,7 @@ static int __devinit i3200_init_one(struct pci_dev *pdev,
return rc; return rc;
} }
static void __devexit i3200_remove_one(struct pci_dev *pdev) static void i3200_remove_one(struct pci_dev *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
struct i3200_priv *priv; struct i3200_priv *priv;
...@@ -467,7 +466,7 @@ MODULE_DEVICE_TABLE(pci, i3200_pci_tbl); ...@@ -467,7 +466,7 @@ MODULE_DEVICE_TABLE(pci, i3200_pci_tbl);
static struct pci_driver i3200_driver = { static struct pci_driver i3200_driver = {
.name = EDAC_MOD_STR, .name = EDAC_MOD_STR,
.probe = i3200_init_one, .probe = i3200_init_one,
.remove = __devexit_p(i3200_remove_one), .remove = i3200_remove_one,
.id_table = i3200_pci_tbl, .id_table = i3200_pci_tbl,
}; };
......
drivers/edac/i5000_edac.c
浏览文件 @ 9b3c6e85
...@@ -1489,8 +1489,7 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx) ...@@ -1489,8 +1489,7 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx)
* negative on error * negative on error
* count (>= 0) * count (>= 0)
*/ */
static int __devinit i5000_init_one(struct pci_dev *pdev, static int i5000_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
int rc; int rc;
...@@ -1509,7 +1508,7 @@ static int __devinit i5000_init_one(struct pci_dev *pdev, ...@@ -1509,7 +1508,7 @@ static int __devinit i5000_init_one(struct pci_dev *pdev,
* i5000_remove_one destructor for one instance of device * i5000_remove_one destructor for one instance of device
* *
*/ */
static void __devexit i5000_remove_one(struct pci_dev *pdev) static void i5000_remove_one(struct pci_dev *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
...@@ -1547,7 +1546,7 @@ MODULE_DEVICE_TABLE(pci, i5000_pci_tbl); ...@@ -1547,7 +1546,7 @@ MODULE_DEVICE_TABLE(pci, i5000_pci_tbl);
static struct pci_driver i5000_driver = { static struct pci_driver i5000_driver = {
.name = KBUILD_BASENAME, .name = KBUILD_BASENAME,
.probe = i5000_init_one, .probe = i5000_init_one,
.remove = __devexit_p(i5000_remove_one), .remove = i5000_remove_one,
.id_table = i5000_pci_tbl, .id_table = i5000_pci_tbl,
}; };
......
drivers/edac/i5100_edac.c
浏览文件 @ 9b3c6e85
...@@ -638,8 +638,7 @@ static struct pci_dev *pci_get_device_func(unsigned vendor, ...@@ -638,8 +638,7 @@ static struct pci_dev *pci_get_device_func(unsigned vendor,
return ret; return ret;
} }
static unsigned long __devinit i5100_npages(struct mem_ctl_info *mci, static unsigned long i5100_npages(struct mem_ctl_info *mci, int csrow)
int csrow)
{ {
struct i5100_priv *priv = mci->pvt_info; struct i5100_priv *priv = mci->pvt_info;
const unsigned chan_rank = i5100_csrow_to_rank(mci, csrow); const unsigned chan_rank = i5100_csrow_to_rank(mci, csrow);
...@@ -660,7 +659,7 @@ static unsigned long __devinit i5100_npages(struct mem_ctl_info *mci, ...@@ -660,7 +659,7 @@ static unsigned long __devinit i5100_npages(struct mem_ctl_info *mci,
((unsigned long long) (1ULL << addr_lines) / PAGE_SIZE); ((unsigned long long) (1ULL << addr_lines) / PAGE_SIZE);
} }
static void __devinit i5100_init_mtr(struct mem_ctl_info *mci) static void i5100_init_mtr(struct mem_ctl_info *mci)
{ {
struct i5100_priv *priv = mci->pvt_info; struct i5100_priv *priv = mci->pvt_info;
struct pci_dev *mms[2] = { priv->ch0mm, priv->ch1mm }; struct pci_dev *mms[2] = { priv->ch0mm, priv->ch1mm };
...@@ -732,7 +731,7 @@ static int i5100_read_spd_byte(const struct mem_ctl_info *mci, ...@@ -732,7 +731,7 @@ static int i5100_read_spd_byte(const struct mem_ctl_info *mci,
* o not the only way to may chip selects to dimm slots * o not the only way to may chip selects to dimm slots
* o investigate if there is some way to obtain this map from the bios * o investigate if there is some way to obtain this map from the bios
*/ */
static void __devinit i5100_init_dimm_csmap(struct mem_ctl_info *mci) static void i5100_init_dimm_csmap(struct mem_ctl_info *mci)
{ {
struct i5100_priv *priv = mci->pvt_info; struct i5100_priv *priv = mci->pvt_info;
int i; int i;
...@@ -762,8 +761,8 @@ static void __devinit i5100_init_dimm_csmap(struct mem_ctl_info *mci) ...@@ -762,8 +761,8 @@ static void __devinit i5100_init_dimm_csmap(struct mem_ctl_info *mci)
} }
} }
static void __devinit i5100_init_dimm_layout(struct pci_dev *pdev, static void i5100_init_dimm_layout(struct pci_dev *pdev,
struct mem_ctl_info *mci) struct mem_ctl_info *mci)
{ {
struct i5100_priv *priv = mci->pvt_info; struct i5100_priv *priv = mci->pvt_info;
int i; int i;
...@@ -784,8 +783,8 @@ static void __devinit i5100_init_dimm_layout(struct pci_dev *pdev, ...@@ -784,8 +783,8 @@ static void __devinit i5100_init_dimm_layout(struct pci_dev *pdev,
i5100_init_dimm_csmap(mci); i5100_init_dimm_csmap(mci);
} }
static void __devinit i5100_init_interleaving(struct pci_dev *pdev, static void i5100_init_interleaving(struct pci_dev *pdev,
struct mem_ctl_info *mci) struct mem_ctl_info *mci)
{ {
u16 w; u16 w;
u32 dw; u32 dw;
...@@ -830,7 +829,7 @@ static void __devinit i5100_init_interleaving(struct pci_dev *pdev, ...@@ -830,7 +829,7 @@ static void __devinit i5100_init_interleaving(struct pci_dev *pdev,
i5100_init_mtr(mci); i5100_init_mtr(mci);
} }
static void __devinit i5100_init_csrows(struct mem_ctl_info *mci) static void i5100_init_csrows(struct mem_ctl_info *mci)
{ {
int i; int i;
struct i5100_priv *priv = mci->pvt_info; struct i5100_priv *priv = mci->pvt_info;
...@@ -864,8 +863,7 @@ static void __devinit i5100_init_csrows(struct mem_ctl_info *mci) ...@@ -864,8 +863,7 @@ static void __devinit i5100_init_csrows(struct mem_ctl_info *mci)
} }
} }
static int __devinit i5100_init_one(struct pci_dev *pdev, static int i5100_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
int rc; int rc;
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
...@@ -1020,7 +1018,7 @@ static int __devinit i5100_init_one(struct pci_dev *pdev, ...@@ -1020,7 +1018,7 @@ static int __devinit i5100_init_one(struct pci_dev *pdev,
return ret; return ret;
} }
static void __devexit i5100_remove_one(struct pci_dev *pdev) static void i5100_remove_one(struct pci_dev *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
struct i5100_priv *priv; struct i5100_priv *priv;
...@@ -1054,7 +1052,7 @@ MODULE_DEVICE_TABLE(pci, i5100_pci_tbl); ...@@ -1054,7 +1052,7 @@ MODULE_DEVICE_TABLE(pci, i5100_pci_tbl);
static struct pci_driver i5100_driver = { static struct pci_driver i5100_driver = {
.name = KBUILD_BASENAME, .name = KBUILD_BASENAME,
.probe = i5100_init_one, .probe = i5100_init_one,
.remove = __devexit_p(i5100_remove_one), .remove = i5100_remove_one,
.id_table = i5100_pci_tbl, .id_table = i5100_pci_tbl,
}; };
......
drivers/edac/i5400_edac.c
浏览文件 @ 9b3c6e85
...@@ -1373,8 +1373,7 @@ static int i5400_probe1(struct pci_dev *pdev, int dev_idx) ...@@ -1373,8 +1373,7 @@ static int i5400_probe1(struct pci_dev *pdev, int dev_idx)
* negative on error * negative on error
* count (>= 0) * count (>= 0)
*/ */
static int __devinit i5400_init_one(struct pci_dev *pdev, static int i5400_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
int rc; int rc;
...@@ -1393,7 +1392,7 @@ static int __devinit i5400_init_one(struct pci_dev *pdev, ...@@ -1393,7 +1392,7 @@ static int __devinit i5400_init_one(struct pci_dev *pdev,
* i5400_remove_one destructor for one instance of device * i5400_remove_one destructor for one instance of device
* *
*/ */
static void __devexit i5400_remove_one(struct pci_dev *pdev) static void i5400_remove_one(struct pci_dev *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
...@@ -1431,7 +1430,7 @@ MODULE_DEVICE_TABLE(pci, i5400_pci_tbl); ...@@ -1431,7 +1430,7 @@ MODULE_DEVICE_TABLE(pci, i5400_pci_tbl);
static struct pci_driver i5400_driver = { static struct pci_driver i5400_driver = {
.name = "i5400_edac", .name = "i5400_edac",
.probe = i5400_init_one, .probe = i5400_init_one,
.remove = __devexit_p(i5400_remove_one), .remove = i5400_remove_one,
.id_table = i5400_pci_tbl, .id_table = i5400_pci_tbl,
}; };
......
drivers/edac/i7300_edac.c
浏览文件 @ 9b3c6e85
...@@ -923,7 +923,7 @@ static void i7300_put_devices(struct mem_ctl_info *mci) ...@@ -923,7 +923,7 @@ static void i7300_put_devices(struct mem_ctl_info *mci)
* Device 21 function 0: PCI_DEVICE_ID_INTEL_I7300_MCH_FB0 * Device 21 function 0: PCI_DEVICE_ID_INTEL_I7300_MCH_FB0
* Device 22 function 0: PCI_DEVICE_ID_INTEL_I7300_MCH_FB1 * Device 22 function 0: PCI_DEVICE_ID_INTEL_I7300_MCH_FB1
*/ */
static int __devinit i7300_get_devices(struct mem_ctl_info *mci) static int i7300_get_devices(struct mem_ctl_info *mci)
{ {
struct i7300_pvt *pvt; struct i7300_pvt *pvt;
struct pci_dev *pdev; struct pci_dev *pdev;
...@@ -1008,8 +1008,7 @@ static int __devinit i7300_get_devices(struct mem_ctl_info *mci) ...@@ -1008,8 +1008,7 @@ static int __devinit i7300_get_devices(struct mem_ctl_info *mci)
* @pdev: struct pci_dev pointer * @pdev: struct pci_dev pointer
* @id: struct pci_device_id pointer - currently unused * @id: struct pci_device_id pointer - currently unused
*/ */
static int __devinit i7300_init_one(struct pci_dev *pdev, static int i7300_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
struct edac_mc_layer layers[3]; struct edac_mc_layer layers[3];
...@@ -1122,7 +1121,7 @@ static int __devinit i7300_init_one(struct pci_dev *pdev, ...@@ -1122,7 +1121,7 @@ static int __devinit i7300_init_one(struct pci_dev *pdev,
* i7300_remove_one() - Remove the driver * i7300_remove_one() - Remove the driver
* @pdev: struct pci_dev pointer * @pdev: struct pci_dev pointer
*/ */
static void __devexit i7300_remove_one(struct pci_dev *pdev) static void i7300_remove_one(struct pci_dev *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
char *tmp; char *tmp;
...@@ -1163,7 +1162,7 @@ MODULE_DEVICE_TABLE(pci, i7300_pci_tbl); ...@@ -1163,7 +1162,7 @@ MODULE_DEVICE_TABLE(pci, i7300_pci_tbl);
static struct pci_driver i7300_driver = { static struct pci_driver i7300_driver = {
.name = "i7300_edac", .name = "i7300_edac",
.probe = i7300_init_one, .probe = i7300_init_one,
.remove = __devexit_p(i7300_remove_one), .remove = i7300_remove_one,
.id_table = i7300_pci_tbl, .id_table = i7300_pci_tbl,
}; };
......
drivers/edac/i7core_edac.c
浏览文件 @ 9b3c6e85
...@@ -2305,8 +2305,7 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev) ...@@ -2305,8 +2305,7 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev)
* < 0 for error code * < 0 for error code
*/ */
static int __devinit i7core_probe(struct pci_dev *pdev, static int i7core_probe(struct pci_dev *pdev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
int rc, count = 0; int rc, count = 0;
struct i7core_dev *i7core_dev; struct i7core_dev *i7core_dev;
...@@ -2368,7 +2367,7 @@ static int __devinit i7core_probe(struct pci_dev *pdev, ...@@ -2368,7 +2367,7 @@ static int __devinit i7core_probe(struct pci_dev *pdev,
* i7core_remove destructor for one instance of device * i7core_remove destructor for one instance of device
* *
*/ */
static void __devexit i7core_remove(struct pci_dev *pdev) static void i7core_remove(struct pci_dev *pdev)
{ {
struct i7core_dev *i7core_dev; struct i7core_dev *i7core_dev;
...@@ -2409,7 +2408,7 @@ MODULE_DEVICE_TABLE(pci, i7core_pci_tbl); ...@@ -2409,7 +2408,7 @@ MODULE_DEVICE_TABLE(pci, i7core_pci_tbl);
static struct pci_driver i7core_driver = { static struct pci_driver i7core_driver = {
.name = "i7core_edac", .name = "i7core_edac",
.probe = i7core_probe, .probe = i7core_probe,
.remove = __devexit_p(i7core_remove), .remove = i7core_remove,
.id_table = i7core_pci_tbl, .id_table = i7core_pci_tbl,
}; };
......
drivers/edac/i82443bxgx_edac.c
浏览文件 @ 9b3c6e85
...@@ -353,8 +353,8 @@ static int i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx) ...@@ -353,8 +353,8 @@ static int i82443bxgx_edacmc_probe1(struct pci_dev *pdev, int dev_idx)
EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_probe1); EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_probe1);
/* returns count (>= 0), or negative on error */ /* returns count (>= 0), or negative on error */
static int __devinit i82443bxgx_edacmc_init_one(struct pci_dev *pdev, static int i82443bxgx_edacmc_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int rc; int rc;
...@@ -369,7 +369,7 @@ static int __devinit i82443bxgx_edacmc_init_one(struct pci_dev *pdev, ...@@ -369,7 +369,7 @@ static int __devinit i82443bxgx_edacmc_init_one(struct pci_dev *pdev,
return rc; return rc;
} }
static void __devexit i82443bxgx_edacmc_remove_one(struct pci_dev *pdev) static void i82443bxgx_edacmc_remove_one(struct pci_dev *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
...@@ -399,7 +399,7 @@ MODULE_DEVICE_TABLE(pci, i82443bxgx_pci_tbl); ...@@ -399,7 +399,7 @@ MODULE_DEVICE_TABLE(pci, i82443bxgx_pci_tbl);
static struct pci_driver i82443bxgx_edacmc_driver = { static struct pci_driver i82443bxgx_edacmc_driver = {
.name = EDAC_MOD_STR, .name = EDAC_MOD_STR,
.probe = i82443bxgx_edacmc_init_one, .probe = i82443bxgx_edacmc_init_one,
.remove = __devexit_p(i82443bxgx_edacmc_remove_one), .remove = i82443bxgx_edacmc_remove_one,
.id_table = i82443bxgx_pci_tbl, .id_table = i82443bxgx_pci_tbl,
}; };
......
drivers/edac/i82860_edac.c
浏览文件 @ 9b3c6e85
...@@ -254,8 +254,8 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx) ...@@ -254,8 +254,8 @@ static int i82860_probe1(struct pci_dev *pdev, int dev_idx)
} }
/* returns count (>= 0), or negative on error */ /* returns count (>= 0), or negative on error */
static int __devinit i82860_init_one(struct pci_dev *pdev, static int i82860_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int rc; int rc;
...@@ -273,7 +273,7 @@ static int __devinit i82860_init_one(struct pci_dev *pdev, ...@@ -273,7 +273,7 @@ static int __devinit i82860_init_one(struct pci_dev *pdev,
return rc; return rc;
} }
static void __devexit i82860_remove_one(struct pci_dev *pdev) static void i82860_remove_one(struct pci_dev *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
...@@ -302,7 +302,7 @@ MODULE_DEVICE_TABLE(pci, i82860_pci_tbl); ...@@ -302,7 +302,7 @@ MODULE_DEVICE_TABLE(pci, i82860_pci_tbl);
static struct pci_driver i82860_driver = { static struct pci_driver i82860_driver = {
.name = EDAC_MOD_STR, .name = EDAC_MOD_STR,
.probe = i82860_init_one, .probe = i82860_init_one,
.remove = __devexit_p(i82860_remove_one), .remove = i82860_remove_one,
.id_table = i82860_pci_tbl, .id_table = i82860_pci_tbl,
}; };
......
drivers/edac/i82875p_edac.c
浏览文件 @ 9b3c6e85
...@@ -479,8 +479,8 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx) ...@@ -479,8 +479,8 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
} }
/* returns count (>= 0), or negative on error */ /* returns count (>= 0), or negative on error */
static int __devinit i82875p_init_one(struct pci_dev *pdev, static int i82875p_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int rc; int rc;
...@@ -498,7 +498,7 @@ static int __devinit i82875p_init_one(struct pci_dev *pdev, ...@@ -498,7 +498,7 @@ static int __devinit i82875p_init_one(struct pci_dev *pdev,
return rc; return rc;
} }
static void __devexit i82875p_remove_one(struct pci_dev *pdev) static void i82875p_remove_one(struct pci_dev *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
struct i82875p_pvt *pvt = NULL; struct i82875p_pvt *pvt = NULL;
...@@ -541,7 +541,7 @@ MODULE_DEVICE_TABLE(pci, i82875p_pci_tbl); ...@@ -541,7 +541,7 @@ MODULE_DEVICE_TABLE(pci, i82875p_pci_tbl);
static struct pci_driver i82875p_driver = { static struct pci_driver i82875p_driver = {
.name = EDAC_MOD_STR, .name = EDAC_MOD_STR,
.probe = i82875p_init_one, .probe = i82875p_init_one,
.remove = __devexit_p(i82875p_remove_one), .remove = i82875p_remove_one,
.id_table = i82875p_pci_tbl, .id_table = i82875p_pci_tbl,
}; };
......
drivers/edac/i82975x_edac.c
浏览文件 @ 9b3c6e85
...@@ -592,8 +592,8 @@ static int i82975x_probe1(struct pci_dev *pdev, int dev_idx) ...@@ -592,8 +592,8 @@ static int i82975x_probe1(struct pci_dev *pdev, int dev_idx)
} }
/* returns count (>= 0), or negative on error */ /* returns count (>= 0), or negative on error */
static int __devinit i82975x_init_one(struct pci_dev *pdev, static int i82975x_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int rc; int rc;
...@@ -610,7 +610,7 @@ static int __devinit i82975x_init_one(struct pci_dev *pdev, ...@@ -610,7 +610,7 @@ static int __devinit i82975x_init_one(struct pci_dev *pdev,
return rc; return rc;
} }
static void __devexit i82975x_remove_one(struct pci_dev *pdev) static void i82975x_remove_one(struct pci_dev *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
struct i82975x_pvt *pvt; struct i82975x_pvt *pvt;
...@@ -643,7 +643,7 @@ MODULE_DEVICE_TABLE(pci, i82975x_pci_tbl); ...@@ -643,7 +643,7 @@ MODULE_DEVICE_TABLE(pci, i82975x_pci_tbl);
static struct pci_driver i82975x_driver = { static struct pci_driver i82975x_driver = {
.name = EDAC_MOD_STR, .name = EDAC_MOD_STR,
.probe = i82975x_init_one, .probe = i82975x_init_one,
.remove = __devexit_p(i82975x_remove_one), .remove = i82975x_remove_one,
.id_table = i82975x_pci_tbl, .id_table = i82975x_pci_tbl,
}; };
......
drivers/edac/mpc85xx_edac.c
浏览文件 @ 9b3c6e85
...@@ -212,7 +212,7 @@ static irqreturn_t mpc85xx_pci_isr(int irq, void *dev_id) ...@@ -212,7 +212,7 @@ static irqreturn_t mpc85xx_pci_isr(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
int __devinit mpc85xx_pci_err_probe(struct platform_device *op) int mpc85xx_pci_err_probe(struct platform_device *op)
{ {
struct edac_pci_ctl_info *pci; struct edac_pci_ctl_info *pci;
struct mpc85xx_pci_pdata *pdata; struct mpc85xx_pci_pdata *pdata;
...@@ -504,7 +504,7 @@ static irqreturn_t mpc85xx_l2_isr(int irq, void *dev_id) ...@@ -504,7 +504,7 @@ static irqreturn_t mpc85xx_l2_isr(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit mpc85xx_l2_err_probe(struct platform_device *op) static int mpc85xx_l2_err_probe(struct platform_device *op)
{ {
struct edac_device_ctl_info *edac_dev; struct edac_device_ctl_info *edac_dev;
struct mpc85xx_l2_pdata *pdata; struct mpc85xx_l2_pdata *pdata;
...@@ -885,7 +885,7 @@ static irqreturn_t mpc85xx_mc_isr(int irq, void *dev_id) ...@@ -885,7 +885,7 @@ static irqreturn_t mpc85xx_mc_isr(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static void __devinit mpc85xx_init_csrows(struct mem_ctl_info *mci) static void mpc85xx_init_csrows(struct mem_ctl_info *mci)
{ {
struct mpc85xx_mc_pdata *pdata = mci->pvt_info; struct mpc85xx_mc_pdata *pdata = mci->pvt_info;
struct csrow_info *csrow; struct csrow_info *csrow;
...@@ -964,7 +964,7 @@ static void __devinit mpc85xx_init_csrows(struct mem_ctl_info *mci) ...@@ -964,7 +964,7 @@ static void __devinit mpc85xx_init_csrows(struct mem_ctl_info *mci)
} }
} }
static int __devinit mpc85xx_mc_err_probe(struct platform_device *op) static int mpc85xx_mc_err_probe(struct platform_device *op)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
struct edac_mc_layer layers[2]; struct edac_mc_layer layers[2];
......
drivers/edac/mv64x60_edac.c
浏览文件 @ 9b3c6e85
...@@ -100,7 +100,7 @@ static int __init mv64x60_pci_fixup(struct platform_device *pdev) ...@@ -100,7 +100,7 @@ static int __init mv64x60_pci_fixup(struct platform_device *pdev)
return 0; return 0;
} }
static int __devinit mv64x60_pci_err_probe(struct platform_device *pdev) static int mv64x60_pci_err_probe(struct platform_device *pdev)
{ {
struct edac_pci_ctl_info *pci; struct edac_pci_ctl_info *pci;
struct mv64x60_pci_pdata *pdata; struct mv64x60_pci_pdata *pdata;
...@@ -221,7 +221,7 @@ static int mv64x60_pci_err_remove(struct platform_device *pdev) ...@@ -221,7 +221,7 @@ static int mv64x60_pci_err_remove(struct platform_device *pdev)
static struct platform_driver mv64x60_pci_err_driver = { static struct platform_driver mv64x60_pci_err_driver = {
.probe = mv64x60_pci_err_probe, .probe = mv64x60_pci_err_probe,
.remove = __devexit_p(mv64x60_pci_err_remove), .remove = mv64x60_pci_err_remove,
.driver = { .driver = {
.name = "mv64x60_pci_err", .name = "mv64x60_pci_err",
} }
...@@ -271,7 +271,7 @@ static irqreturn_t mv64x60_sram_isr(int irq, void *dev_id) ...@@ -271,7 +271,7 @@ static irqreturn_t mv64x60_sram_isr(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit mv64x60_sram_err_probe(struct platform_device *pdev) static int mv64x60_sram_err_probe(struct platform_device *pdev)
{ {
struct edac_device_ctl_info *edac_dev; struct edac_device_ctl_info *edac_dev;
struct mv64x60_sram_pdata *pdata; struct mv64x60_sram_pdata *pdata;
...@@ -439,7 +439,7 @@ static irqreturn_t mv64x60_cpu_isr(int irq, void *dev_id) ...@@ -439,7 +439,7 @@ static irqreturn_t mv64x60_cpu_isr(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit mv64x60_cpu_err_probe(struct platform_device *pdev) static int mv64x60_cpu_err_probe(struct platform_device *pdev)
{ {
struct edac_device_ctl_info *edac_dev; struct edac_device_ctl_info *edac_dev;
struct resource *r; struct resource *r;
...@@ -697,7 +697,7 @@ static void mv64x60_init_csrows(struct mem_ctl_info *mci, ...@@ -697,7 +697,7 @@ static void mv64x60_init_csrows(struct mem_ctl_info *mci,
dimm->edac_mode = EDAC_SECDED; dimm->edac_mode = EDAC_SECDED;
} }
static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev) static int mv64x60_mc_err_probe(struct platform_device *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
struct edac_mc_layer layers[2]; struct edac_mc_layer layers[2];
......
drivers/edac/octeon_edac-l2c.c
浏览文件 @ 9b3c6e85
...@@ -131,7 +131,7 @@ static void octeon_l2c_poll_oct2(struct edac_device_ctl_info *l2c) ...@@ -131,7 +131,7 @@ static void octeon_l2c_poll_oct2(struct edac_device_ctl_info *l2c)
_octeon_l2c_poll_oct2(l2c, i); _octeon_l2c_poll_oct2(l2c, i);
} }
static int __devinit octeon_l2c_probe(struct platform_device *pdev) static int octeon_l2c_probe(struct platform_device *pdev)
{ {
struct edac_device_ctl_info *l2c; struct edac_device_ctl_info *l2c;
......
drivers/edac/octeon_edac-lmc.c
浏览文件 @ 9b3c6e85
...@@ -86,7 +86,7 @@ static void octeon_lmc_edac_poll_o2(struct mem_ctl_info *mci) ...@@ -86,7 +86,7 @@ static void octeon_lmc_edac_poll_o2(struct mem_ctl_info *mci)
cvmx_write_csr(CVMX_LMCX_INT(mci->mc_idx), int_reg.u64); cvmx_write_csr(CVMX_LMCX_INT(mci->mc_idx), int_reg.u64);
} }
static int __devinit octeon_lmc_edac_probe(struct platform_device *pdev) static int octeon_lmc_edac_probe(struct platform_device *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
struct edac_mc_layer layers[1]; struct edac_mc_layer layers[1];
......
drivers/edac/octeon_edac-pc.c
浏览文件 @ 9b3c6e85
...@@ -82,7 +82,7 @@ static int co_cache_error_event(struct notifier_block *this, ...@@ -82,7 +82,7 @@ static int co_cache_error_event(struct notifier_block *this,
return NOTIFY_STOP; return NOTIFY_STOP;
} }
static int __devinit co_cache_error_probe(struct platform_device *pdev) static int co_cache_error_probe(struct platform_device *pdev)
{ {
struct co_cache_error *p = devm_kzalloc(&pdev->dev, sizeof(*p), struct co_cache_error *p = devm_kzalloc(&pdev->dev, sizeof(*p),
GFP_KERNEL); GFP_KERNEL);
......
drivers/edac/octeon_edac-pci.c
浏览文件 @ 9b3c6e85
...@@ -58,7 +58,7 @@ static void octeon_pci_poll(struct edac_pci_ctl_info *pci) ...@@ -58,7 +58,7 @@ static void octeon_pci_poll(struct edac_pci_ctl_info *pci)
} }
} }
static int __devinit octeon_pci_probe(struct platform_device *pdev) static int octeon_pci_probe(struct platform_device *pdev)
{ {
struct edac_pci_ctl_info *pci; struct edac_pci_ctl_info *pci;
int res = 0; int res = 0;
......
drivers/edac/pasemi_edac.c
浏览文件 @ 9b3c6e85
...@@ -188,8 +188,8 @@ static int pasemi_edac_init_csrows(struct mem_ctl_info *mci, ...@@ -188,8 +188,8 @@ static int pasemi_edac_init_csrows(struct mem_ctl_info *mci,
return 0; return 0;
} }
static int __devinit pasemi_edac_probe(struct pci_dev *pdev, static int pasemi_edac_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct mem_ctl_info *mci = NULL; struct mem_ctl_info *mci = NULL;
struct edac_mc_layer layers[2]; struct edac_mc_layer layers[2];
...@@ -266,7 +266,7 @@ static int __devinit pasemi_edac_probe(struct pci_dev *pdev, ...@@ -266,7 +266,7 @@ static int __devinit pasemi_edac_probe(struct pci_dev *pdev,
return -ENODEV; return -ENODEV;
} }
static void __devexit pasemi_edac_remove(struct pci_dev *pdev) static void pasemi_edac_remove(struct pci_dev *pdev)
{ {
struct mem_ctl_info *mci = edac_mc_del_mc(&pdev->dev); struct mem_ctl_info *mci = edac_mc_del_mc(&pdev->dev);
...@@ -287,7 +287,7 @@ MODULE_DEVICE_TABLE(pci, pasemi_edac_pci_tbl); ...@@ -287,7 +287,7 @@ MODULE_DEVICE_TABLE(pci, pasemi_edac_pci_tbl);
static struct pci_driver pasemi_edac_driver = { static struct pci_driver pasemi_edac_driver = {
.name = MODULE_NAME, .name = MODULE_NAME,
.probe = pasemi_edac_probe, .probe = pasemi_edac_probe,
.remove = __devexit_p(pasemi_edac_remove), .remove = pasemi_edac_remove,
.id_table = pasemi_edac_pci_tbl, .id_table = pasemi_edac_pci_tbl,
}; };
......
drivers/edac/ppc4xx_edac.c
浏览文件 @ 9b3c6e85
...@@ -838,8 +838,7 @@ ppc4xx_edac_isr(int irq, void *dev_id) ...@@ -838,8 +838,7 @@ ppc4xx_edac_isr(int irq, void *dev_id)
* *
* Returns a device type width enumeration. * Returns a device type width enumeration.
*/ */
static enum dev_type __devinit static enum dev_type ppc4xx_edac_get_dtype(u32 mcopt1)
ppc4xx_edac_get_dtype(u32 mcopt1)
{ {
switch (mcopt1 & SDRAM_MCOPT1_WDTH_MASK) { switch (mcopt1 & SDRAM_MCOPT1_WDTH_MASK) {
case SDRAM_MCOPT1_WDTH_16: case SDRAM_MCOPT1_WDTH_16:
...@@ -862,8 +861,7 @@ ppc4xx_edac_get_dtype(u32 mcopt1) ...@@ -862,8 +861,7 @@ ppc4xx_edac_get_dtype(u32 mcopt1)
* *
* Returns a memory type enumeration. * Returns a memory type enumeration.
*/ */
static enum mem_type __devinit static enum mem_type ppc4xx_edac_get_mtype(u32 mcopt1)
ppc4xx_edac_get_mtype(u32 mcopt1)
{ {
bool rden = ((mcopt1 & SDRAM_MCOPT1_RDEN_MASK) == SDRAM_MCOPT1_RDEN); bool rden = ((mcopt1 & SDRAM_MCOPT1_RDEN_MASK) == SDRAM_MCOPT1_RDEN);
...@@ -893,8 +891,7 @@ ppc4xx_edac_get_mtype(u32 mcopt1) ...@@ -893,8 +891,7 @@ ppc4xx_edac_get_mtype(u32 mcopt1)
* Returns 0 if OK; otherwise, -EINVAL if the memory bank size * Returns 0 if OK; otherwise, -EINVAL if the memory bank size
* configuration cannot be determined. * configuration cannot be determined.
*/ */
static int __devinit static int ppc4xx_edac_init_csrows(struct mem_ctl_info *mci, u32 mcopt1)
ppc4xx_edac_init_csrows(struct mem_ctl_info *mci, u32 mcopt1)
{ {
const struct ppc4xx_edac_pdata *pdata = mci->pvt_info; const struct ppc4xx_edac_pdata *pdata = mci->pvt_info;
int status = 0; int status = 0;
...@@ -1011,11 +1008,9 @@ ppc4xx_edac_init_csrows(struct mem_ctl_info *mci, u32 mcopt1) ...@@ -1011,11 +1008,9 @@ ppc4xx_edac_init_csrows(struct mem_ctl_info *mci, u32 mcopt1)
* *
* Returns 0 if OK; otherwise, < 0 on error. * Returns 0 if OK; otherwise, < 0 on error.
*/ */
static int __devinit static int ppc4xx_edac_mc_init(struct mem_ctl_info *mci,
ppc4xx_edac_mc_init(struct mem_ctl_info *mci, struct platform_device *op,
struct platform_device *op, const dcr_host_t *dcr_host, u32 mcopt1)
const dcr_host_t *dcr_host,
u32 mcopt1)
{ {
int status = 0; int status = 0;
const u32 memcheck = (mcopt1 & SDRAM_MCOPT1_MCHK_MASK); const u32 memcheck = (mcopt1 & SDRAM_MCOPT1_MCHK_MASK);
...@@ -1105,8 +1100,8 @@ ppc4xx_edac_mc_init(struct mem_ctl_info *mci, ...@@ -1105,8 +1100,8 @@ ppc4xx_edac_mc_init(struct mem_ctl_info *mci,
* Returns 0 if OK; otherwise, -ENODEV if the interrupts could not be * Returns 0 if OK; otherwise, -ENODEV if the interrupts could not be
* mapped and assigned. * mapped and assigned.
*/ */
static int __devinit static int ppc4xx_edac_register_irq(struct platform_device *op,
ppc4xx_edac_register_irq(struct platform_device *op, struct mem_ctl_info *mci) struct mem_ctl_info *mci)
{ {
int status = 0; int status = 0;
int ded_irq, sec_irq; int ded_irq, sec_irq;
...@@ -1183,8 +1178,8 @@ ppc4xx_edac_register_irq(struct platform_device *op, struct mem_ctl_info *mci) ...@@ -1183,8 +1178,8 @@ ppc4xx_edac_register_irq(struct platform_device *op, struct mem_ctl_info *mci)
* Returns 0 if the DCRs were successfully mapped; otherwise, < 0 on * Returns 0 if the DCRs were successfully mapped; otherwise, < 0 on
* error. * error.
*/ */
static int __devinit static int ppc4xx_edac_map_dcrs(const struct device_node *np,
ppc4xx_edac_map_dcrs(const struct device_node *np, dcr_host_t *dcr_host) dcr_host_t *dcr_host)
{ {
unsigned int dcr_base, dcr_len; unsigned int dcr_base, dcr_len;
...@@ -1232,7 +1227,7 @@ ppc4xx_edac_map_dcrs(const struct device_node *np, dcr_host_t *dcr_host) ...@@ -1232,7 +1227,7 @@ ppc4xx_edac_map_dcrs(const struct device_node *np, dcr_host_t *dcr_host)
* Returns 0 if the controller instance was successfully bound to the * Returns 0 if the controller instance was successfully bound to the
* driver; otherwise, < 0 on error. * driver; otherwise, < 0 on error.
*/ */
static int __devinit ppc4xx_edac_probe(struct platform_device *op) static int ppc4xx_edac_probe(struct platform_device *op)
{ {
int status = 0; int status = 0;
u32 mcopt1, memcheck; u32 mcopt1, memcheck;
......
drivers/edac/r82600_edac.c
浏览文件 @ 9b3c6e85
...@@ -359,8 +359,8 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx) ...@@ -359,8 +359,8 @@ static int r82600_probe1(struct pci_dev *pdev, int dev_idx)
} }
/* returns count (>= 0), or negative on error */ /* returns count (>= 0), or negative on error */
static int __devinit r82600_init_one(struct pci_dev *pdev, static int r82600_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
edac_dbg(0, "\n"); edac_dbg(0, "\n");
...@@ -368,7 +368,7 @@ static int __devinit r82600_init_one(struct pci_dev *pdev, ...@@ -368,7 +368,7 @@ static int __devinit r82600_init_one(struct pci_dev *pdev,
return r82600_probe1(pdev, ent->driver_data); return r82600_probe1(pdev, ent->driver_data);
} }
static void __devexit r82600_remove_one(struct pci_dev *pdev) static void r82600_remove_one(struct pci_dev *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
...@@ -397,7 +397,7 @@ MODULE_DEVICE_TABLE(pci, r82600_pci_tbl); ...@@ -397,7 +397,7 @@ MODULE_DEVICE_TABLE(pci, r82600_pci_tbl);
static struct pci_driver r82600_driver = { static struct pci_driver r82600_driver = {
.name = EDAC_MOD_STR, .name = EDAC_MOD_STR,
.probe = r82600_init_one, .probe = r82600_init_one,
.remove = __devexit_p(r82600_remove_one), .remove = r82600_remove_one,
.id_table = r82600_pci_tbl, .id_table = r82600_pci_tbl,
}; };
......
drivers/edac/sb_edac.c
浏览文件 @ 9b3c6e85
...@@ -1692,8 +1692,7 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev) ...@@ -1692,8 +1692,7 @@ static int sbridge_register_mci(struct sbridge_dev *sbridge_dev)
* < 0 for error code * < 0 for error code
*/ */
static int __devinit sbridge_probe(struct pci_dev *pdev, static int sbridge_probe(struct pci_dev *pdev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
int rc; int rc;
u8 mc, num_mc = 0; u8 mc, num_mc = 0;
...@@ -1744,7 +1743,7 @@ static int __devinit sbridge_probe(struct pci_dev *pdev, ...@@ -1744,7 +1743,7 @@ static int __devinit sbridge_probe(struct pci_dev *pdev,
* sbridge_remove destructor for one instance of device * sbridge_remove destructor for one instance of device
* *
*/ */
static void __devexit sbridge_remove(struct pci_dev *pdev) static void sbridge_remove(struct pci_dev *pdev)
{ {
struct sbridge_dev *sbridge_dev; struct sbridge_dev *sbridge_dev;
...@@ -1785,7 +1784,7 @@ MODULE_DEVICE_TABLE(pci, sbridge_pci_tbl); ...@@ -1785,7 +1784,7 @@ MODULE_DEVICE_TABLE(pci, sbridge_pci_tbl);
static struct pci_driver sbridge_driver = { static struct pci_driver sbridge_driver = {
.name = "sbridge_edac", .name = "sbridge_edac",
.probe = sbridge_probe, .probe = sbridge_probe,
.remove = __devexit_p(sbridge_remove), .remove = sbridge_remove,
.id_table = sbridge_pci_tbl, .id_table = sbridge_pci_tbl,
}; };
......
drivers/edac/tile_edac.c
浏览文件 @ 9b3c6e85
...@@ -82,7 +82,7 @@ static void tile_edac_check(struct mem_ctl_info *mci) ...@@ -82,7 +82,7 @@ static void tile_edac_check(struct mem_ctl_info *mci)
* Initialize the 'csrows' table within the mci control structure with the * Initialize the 'csrows' table within the mci control structure with the
* addressing of memory. * addressing of memory.
*/ */
static int __devinit tile_edac_init_csrows(struct mem_ctl_info *mci) static int tile_edac_init_csrows(struct mem_ctl_info *mci)
{ {
struct csrow_info *csrow = mci->csrows[0]; struct csrow_info *csrow = mci->csrows[0];
struct tile_edac_priv *priv = mci->pvt_info; struct tile_edac_priv *priv = mci->pvt_info;
...@@ -120,7 +120,7 @@ static int __devinit tile_edac_init_csrows(struct mem_ctl_info *mci) ...@@ -120,7 +120,7 @@ static int __devinit tile_edac_init_csrows(struct mem_ctl_info *mci)
return 0; return 0;
} }
static int __devinit tile_edac_mc_probe(struct platform_device *pdev) static int tile_edac_mc_probe(struct platform_device *pdev)
{ {
char hv_file[32]; char hv_file[32];
int hv_devhdl; int hv_devhdl;
...@@ -186,7 +186,7 @@ static int __devinit tile_edac_mc_probe(struct platform_device *pdev) ...@@ -186,7 +186,7 @@ static int __devinit tile_edac_mc_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit tile_edac_mc_remove(struct platform_device *pdev) static int tile_edac_mc_remove(struct platform_device *pdev)
{ {
struct mem_ctl_info *mci = platform_get_drvdata(pdev); struct mem_ctl_info *mci = platform_get_drvdata(pdev);
...@@ -202,7 +202,7 @@ static struct platform_driver tile_edac_mc_driver = { ...@@ -202,7 +202,7 @@ static struct platform_driver tile_edac_mc_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = tile_edac_mc_probe, .probe = tile_edac_mc_probe,
.remove = __devexit_p(tile_edac_mc_remove), .remove = tile_edac_mc_remove,
}; };
/* /*
......
drivers/edac/x38_edac.c
浏览文件 @ 9b3c6e85
...@@ -418,8 +418,7 @@ static int x38_probe1(struct pci_dev *pdev, int dev_idx) ...@@ -418,8 +418,7 @@ static int x38_probe1(struct pci_dev *pdev, int dev_idx)
return rc; return rc;
} }
static int __devinit x38_init_one(struct pci_dev *pdev, static int x38_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
const struct pci_device_id *ent)
{ {
int rc; int rc;
...@@ -435,7 +434,7 @@ static int __devinit x38_init_one(struct pci_dev *pdev, ...@@ -435,7 +434,7 @@ static int __devinit x38_init_one(struct pci_dev *pdev,
return rc; return rc;
} }
static void __devexit x38_remove_one(struct pci_dev *pdev) static void x38_remove_one(struct pci_dev *pdev)
{ {
struct mem_ctl_info *mci; struct mem_ctl_info *mci;
...@@ -464,7 +463,7 @@ MODULE_DEVICE_TABLE(pci, x38_pci_tbl); ...@@ -464,7 +463,7 @@ MODULE_DEVICE_TABLE(pci, x38_pci_tbl);
static struct pci_driver x38_driver = { static struct pci_driver x38_driver = {
.name = EDAC_MOD_STR, .name = EDAC_MOD_STR,
.probe = x38_init_one, .probe = x38_init_one,
.remove = __devexit_p(x38_remove_one), .remove = x38_remove_one,
.id_table = x38_pci_tbl, .id_table = x38_pci_tbl,
}; };
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或