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]
/
arch
/
blackfin
/
mach-common
/
dpmc.c
diff --git
a/arch/blackfin/mach-common/dpmc.c
b/arch/blackfin/mach-common/dpmc.c
index 978bb400be062a350dbe1281ed8c658f0f86b476..724a8c5f5578d14a69f3dcda0933e165f379d21c 100644
(file)
--- a/
arch/blackfin/mach-common/dpmc.c
+++ b/
arch/blackfin/mach-common/dpmc.c
@@
-129,7
+129,7
@@
static struct notifier_block vreg_cpufreq_notifier_block = {
* bfin_dpmc_probe -
*
*/
* bfin_dpmc_probe -
*
*/
-static int
__devinit
bfin_dpmc_probe(struct platform_device *pdev)
+static int bfin_dpmc_probe(struct platform_device *pdev)
{
if (pdev->dev.platform_data)
pdata = pdev->dev.platform_data;
{
if (pdev->dev.platform_data)
pdata = pdev->dev.platform_data;
@@
-143,7
+143,7
@@
static int __devinit bfin_dpmc_probe(struct platform_device *pdev)
/**
* bfin_dpmc_remove -
*/
/**
* bfin_dpmc_remove -
*/
-static int
__devexit
bfin_dpmc_remove(struct platform_device *pdev)
+static int bfin_dpmc_remove(struct platform_device *pdev)
{
pdata = NULL;
return cpufreq_unregister_notifier(&vreg_cpufreq_notifier_block,
{
pdata = NULL;
return cpufreq_unregister_notifier(&vreg_cpufreq_notifier_block,
@@
-152,7
+152,7
@@
static int __devexit bfin_dpmc_remove(struct platform_device *pdev)
struct platform_driver bfin_dpmc_device_driver = {
.probe = bfin_dpmc_probe,
struct platform_driver bfin_dpmc_device_driver = {
.probe = bfin_dpmc_probe,
- .remove =
__devexit_p(bfin_dpmc_remove)
,
+ .remove =
bfin_dpmc_remove
,
.driver = {
.name = DRIVER_NAME,
}
.driver = {
.name = DRIVER_NAME,
}