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
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
edac
/
i7300_edac.c
diff --git
a/drivers/edac/i7300_edac.c
b/drivers/edac/i7300_edac.c
index 9d669cd43618b605d7db354fde86df8c90c64f08..087c27bc5d4247b9b7647f4c4c7695e6a2445036 100644
(file)
--- a/
drivers/edac/i7300_edac.c
+++ b/
drivers/edac/i7300_edac.c
@@
-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 22 function 0: PCI_DEVICE_ID_INTEL_I7300_MCH_FB1
*/
* Device 21 function 0: PCI_DEVICE_ID_INTEL_I7300_MCH_FB0
* 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 pci_dev *pdev;
{
struct i7300_pvt *pvt;
struct pci_dev *pdev;
@@
-1008,8
+1008,7
@@
error:
* @pdev: struct pci_dev pointer
* @id: struct pci_device_id pointer - currently unused
*/
* @pdev: struct pci_dev pointer
* @id: struct pci_device_id pointer - currently unused
*/
-static int __devinit i7300_init_one(struct pci_dev *pdev,
- const struct pci_device_id *id)
+static int i7300_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
{
struct mem_ctl_info *mci;
struct edac_mc_layer layers[3];
{
struct mem_ctl_info *mci;
struct edac_mc_layer layers[3];
@@
-1122,7
+1121,7
@@
fail0:
* i7300_remove_one() - Remove the driver
* @pdev: struct pci_dev pointer
*/
* i7300_remove_one() - Remove the driver
* @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;
char *tmp;
{
struct mem_ctl_info *mci;
char *tmp;
@@
-1163,7
+1162,7
@@
MODULE_DEVICE_TABLE(pci, i7300_pci_tbl);
static struct pci_driver i7300_driver = {
.name = "i7300_edac",
.probe = i7300_init_one,
static struct pci_driver i7300_driver = {
.name = "i7300_edac",
.probe = i7300_init_one,
- .remove =
__devexit_p(i7300_remove_one)
,
+ .remove =
i7300_remove_one
,
.id_table = i7300_pci_tbl,
};
.id_table = i7300_pci_tbl,
};