projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drivers: edac: remove __dev* attributes.
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
edac
/
i5100_edac.c
diff --git
a/drivers/edac/i5100_edac.c
b/drivers/edac/i5100_edac.c
index c4b5e5f868e85ea1e60b0a301d0a7bdc68585a2e..d6955b2cc99fa47bc9ac665fa93eb5f59cafc88e 100644
(file)
--- a/
drivers/edac/i5100_edac.c
+++ b/
drivers/edac/i5100_edac.c
@@
-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,
- int csrow)
+static unsigned long i5100_npages(struct mem_ctl_info *mci, int csrow)
{
struct i5100_priv *priv = mci->pvt_info;
const unsigned chan_rank = i5100_csrow_to_rank(mci, csrow);
{
struct i5100_priv *priv = mci->pvt_info;
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,
((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 pci_dev *mms[2] = { priv->ch0mm, priv->ch1mm };
{
struct i5100_priv *priv = mci->pvt_info;
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,
* 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 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
*/
-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;
int i;
{
struct i5100_priv *priv = mci->pvt_info;
int i;
@@
-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,
-
struct mem_ctl_info *mci)
+static void i5100_init_dimm_layout(struct pci_dev *pdev,
+ struct mem_ctl_info *mci)
{
struct i5100_priv *priv = mci->pvt_info;
int i;
{
struct i5100_priv *priv = mci->pvt_info;
int i;
@@
-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,
-
struct mem_ctl_info *mci)
+static void i5100_init_interleaving(struct pci_dev *pdev,
+ struct mem_ctl_info *mci)
{
u16 w;
u32 dw;
{
u16 w;
u32 dw;
@@
-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;
struct i5100_priv *priv = mci->pvt_info;
{
int i;
struct i5100_priv *priv = mci->pvt_info;
@@
-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,
- const struct pci_device_id *id)
+static int i5100_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
{
int rc;
struct mem_ctl_info *mci;
{
int rc;
struct mem_ctl_info *mci;
@@
-1020,7
+1018,7
@@
bail:
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 i5100_priv *priv;
{
struct mem_ctl_info *mci;
struct i5100_priv *priv;
@@
-1054,7
+1052,7
@@
MODULE_DEVICE_TABLE(pci, i5100_pci_tbl);
static struct pci_driver i5100_driver = {
.name = KBUILD_BASENAME,
.probe = i5100_init_one,
static struct pci_driver i5100_driver = {
.name = KBUILD_BASENAME,
.probe = i5100_init_one,
- .remove =
__devexit_p(i5100_remove_one)
,
+ .remove =
i5100_remove_one
,
.id_table = i5100_pci_tbl,
};
.id_table = i5100_pci_tbl,
};