FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary dahdi_pci_module macro.

Browse Source 
All supported kernel variations support the same signature for
registering a PCI module, so we can eliminate the macro.

Signed-off-by: Shaun Ruffell <sruffell@sruffell.net>
This commit is contained in:
Shaun Ruffell 2019-01-11 04:46:35 +00:00
parent cdd6ddd0fd
commit 4af6f69fff
8 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/dahdi/wcaxx-base.c
View File

@ -4474,7 +4474,7 @@ static int __init wcaxx_init(void)
if (!battthresh) if (!battthresh)
battthresh = fxo_modes[_opermode].battthresh; battthresh = fxo_modes[_opermode].battthresh;
res = dahdi_pci_module(&wcaxx_driver); res = pci_register_driver(&wcaxx_driver);
if (res) if (res)
return -ENODEV; return -ENODEV;

2
drivers/dahdi/wcb4xxp/base.c
View File

@ -3672,7 +3672,7 @@ static int __init b4xx_init(void)
printk(KERN_ERR "%s: ERROR: Could not initialize /proc/%s\n",THIS_MODULE->name, PROCFS_NAME); printk(KERN_ERR "%s: ERROR: Could not initialize /proc/%s\n",THIS_MODULE->name, PROCFS_NAME);
} }
#endif #endif
if (dahdi_pci_module(&b4xx_driver)) if (pci_register_driver(&b4xx_driver))
return -ENODEV; return -ENODEV;
return 0; return 0;

2
drivers/dahdi/wct4xxp/base.c
View File

@ -5543,7 +5543,7 @@ static int __init t4_init(void)
"Please use 'default_linemode' instead.\n"); "Please use 'default_linemode' instead.\n");
} }
res = dahdi_pci_module(&t4_driver); res = pci_register_driver(&t4_driver);
if (res) if (res)
return -ENODEV; return -ENODEV;

2
drivers/dahdi/wctc4xxp/base.c
View File

@ -4236,7 +4236,7 @@ static int __init wctc4xxp_init(void)
return -ENOMEM; return -ENOMEM;
spin_lock_init(&wctc4xxp_list_lock); spin_lock_init(&wctc4xxp_list_lock);
INIT_LIST_HEAD(&wctc4xxp_list); INIT_LIST_HEAD(&wctc4xxp_list);
res = dahdi_pci_module(&wctc4xxp_driver); res = pci_register_driver(&wctc4xxp_driver);
if (res) { if (res) {
kmem_cache_destroy(cmd_cache); kmem_cache_destroy(cmd_cache);
return -ENODEV; return -ENODEV;

2
drivers/dahdi/wctdm24xxp/base.c
View File

@ -6102,7 +6102,7 @@ static int __init wctdm_init(void)
b400m_module_init(); b400m_module_init();
res = dahdi_pci_module(&wctdm_driver); res = pci_register_driver(&wctdm_driver);
if (res) if (res)
return -ENODEV; return -ENODEV;

2
drivers/dahdi/wcte13xp-base.c
View File

@ -2788,7 +2788,7 @@ static int __init te13xp_init(void)
return -EINVAL; return -EINVAL;
} }
res = dahdi_pci_module(&te13xp_driver); res = pci_register_driver(&te13xp_driver);
if (res) if (res)
return -ENODEV; return -ENODEV;

2
drivers/dahdi/wcte43x-base.c
View File

@ -3612,7 +3612,7 @@ static int __init t43x_init(void)
return -EINVAL; return -EINVAL;
} }
res = dahdi_pci_module(&t43x_driver); res = pci_register_driver(&t43x_driver);
if (res) if (res)
return -ENODEV; return -ENODEV;

2
include/dahdi/kernel.h
View File

@ -58,8 +58,6 @@
#include <linux/poll.h> #include <linux/poll.h>
#define dahdi_pci_module pci_register_driver
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#include <linux/pci-aspm.h> #include <linux/pci-aspm.h>
#endif #endif