aboutsummaryrefslogtreecommitdiff
path: root/drivers/misc
diff options
context:
space:
mode:
authorMoyster <oysterized@gmail.com>2017-03-18 02:50:50 +0100
committerMister Oyster <oysterized@gmail.com>2017-04-11 11:00:11 +0200
commit7c777e87cb30fc926920d677a845d651decaf997 (patch)
tree4ff6edc96c270d8d01eb3f25383b8bfe1285c75f /drivers/misc
parentcc9961dd971f43736c1becc49029725425dff854 (diff)
downloadandroid_kernel_m2note-7c777e87cb30fc926920d677a845d651decaf997.tar.gz
Get rid of __cpuinit
This commit is the result of find . -name '*.c' | xargs sed -i 's/ __cpuinit / /g' find . -name '*.c' | xargs sed -i 's/ __cpuexit / /g' find . -name '*.c' | xargs sed -i 's/ __cpuinitdata / /g' find . -name '*.c' | xargs sed -i 's/ __cpuinit$//g' find ./arch/ -name '*.h' | xargs sed -i 's/ __cpuinit//g' find . -name '*.c' | xargs sed -i 's/^__cpuinit //g' find . -name '*.c' | xargs sed -i 's/^__cpuinitdata //g' find . -name '*.c' | xargs sed -i 's/\*__cpuinit /\*/g' find . -name '*.c' | xargs sed -i 's/ __cpuinitconst / /g' find . -name '*.h' | xargs sed -i 's/ __cpuinit / /g' find . -name '*.h' | xargs sed -i 's/ __cpuinitdata / /g' git add . git reset include/linux/init.h git checkout -- include/linux/init.h based off : https://github.com/jollaman999/jolla-kernel_bullhead/commit/bc15db84a622eed7d61d3ece579b577154d0ec29
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/mediatek/etm/mt6735/etmv4/etm_v4.c2
-rw-r--r--drivers/misc/mediatek/irq/mt6735/irq.c4
-rw-r--r--drivers/misc/mediatek/mach/mt6735/ca53_timer.c8
-rw-r--r--drivers/misc/mediatek/mach/mt6735/mt-smp.c6
-rw-r--r--drivers/misc/mediatek/mach/mt6735/mt_cpufreq.c4
-rw-r--r--drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_algo.c4
-rw-r--r--drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_core.c6
-rw-r--r--drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_main.c2
-rw-r--r--drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_procfs.c2
-rw-r--r--drivers/misc/mediatek/watchpoint/mt6735/aarch32/mt_dbg_aarch32.c4
-rw-r--r--drivers/misc/mediatek/watchpoint/mt6735/aarch64/mt_dbg_aarch64.c4
-rw-r--r--drivers/misc/mediatek/wdk/timer_test.c4
-rw-r--r--drivers/misc/mediatek/wdk/wd_common_drv.c4
-rw-r--r--drivers/misc/mediatek/wdk/wdt_test.c4
14 files changed, 29 insertions, 29 deletions
diff --git a/drivers/misc/mediatek/etm/mt6735/etmv4/etm_v4.c b/drivers/misc/mediatek/etm/mt6735/etmv4/etm_v4.c
index 1042c6d05..1c07ac3b2 100644
--- a/drivers/misc/mediatek/etm/mt6735/etmv4/etm_v4.c
+++ b/drivers/misc/mediatek/etm/mt6735/etmv4/etm_v4.c
@@ -2070,7 +2070,7 @@ restart_trace(struct notifier_block *nfb, unsigned long action, void *hcpu)
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata pftracer_notifier = {
+static struct notifier_block pftracer_notifier = {
.notifier_call = restart_trace,
};
diff --git a/drivers/misc/mediatek/irq/mt6735/irq.c b/drivers/misc/mediatek/irq/mt6735/irq.c
index 7fc87cb53..f8dda0fe4 100644
--- a/drivers/misc/mediatek/irq/mt6735/irq.c
+++ b/drivers/misc/mediatek/irq/mt6735/irq.c
@@ -505,7 +505,7 @@ static void mt_gic_cpu_init(void)
dsb();
}
-void __cpuinit mt_gic_secondary_init(void)
+void mt_gic_secondary_init(void)
{
mt_gic_cpu_init();
}
@@ -1152,7 +1152,7 @@ restore_for_fiq(struct notifier_block *nfb, unsigned long action, void *hcpu)
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata fiq_notifier =
+static struct notifier_block fiq_notifier =
{
.notifier_call = restore_for_fiq,
};
diff --git a/drivers/misc/mediatek/mach/mt6735/ca53_timer.c b/drivers/misc/mediatek/mach/mt6735/ca53_timer.c
index d5898d1ac..6028c5360 100644
--- a/drivers/misc/mediatek/mach/mt6735/ca53_timer.c
+++ b/drivers/misc/mediatek/mach/mt6735/ca53_timer.c
@@ -197,7 +197,7 @@ static int arch_timer_set_next_event_phys(unsigned long evt,
return 0;
}
-static int __cpuinit arch_timer_setup(struct clock_event_device *clk)
+static int arch_timer_setup(struct clock_event_device *clk)
{
clk->features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_C3STOP;
clk->name = "arch_sys_timer";
@@ -300,7 +300,7 @@ struct timecounter *arch_timer_get_timecounter(void)
return &timecounter;
}
-static void __cpuinit arch_timer_stop(struct clock_event_device *clk)
+static void arch_timer_stop(struct clock_event_device *clk)
{
pr_debug("arch_timer_teardown disable IRQ%d cpu #%d\n",
clk->irq, smp_processor_id());
@@ -316,7 +316,7 @@ static void __cpuinit arch_timer_stop(struct clock_event_device *clk)
clk->set_mode(CLOCK_EVT_MODE_UNUSED, clk);
}
-static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self,
+static int arch_timer_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
/*
@@ -335,7 +335,7 @@ static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self,
return NOTIFY_OK;
}
-static struct notifier_block arch_timer_cpu_nb __cpuinitdata = {
+static struct notifier_block arch_timer_cpu_nb = {
.notifier_call = arch_timer_cpu_notify,
};
diff --git a/drivers/misc/mediatek/mach/mt6735/mt-smp.c b/drivers/misc/mediatek/mach/mt6735/mt-smp.c
index 13ff264b9..c8207950a 100644
--- a/drivers/misc/mediatek/mach/mt6735/mt-smp.c
+++ b/drivers/misc/mediatek/mach/mt6735/mt-smp.c
@@ -68,7 +68,7 @@ static DEFINE_SPINLOCK(boot_lock);
* observers, irrespective of whether they're taking part in coherency
* or not. This is necessary for the hotplug code to work reliably.
*/
-static void __cpuinit write_pen_release(int val)
+static void write_pen_release(int val)
{
pen_release = val;
smp_wmb();
@@ -104,7 +104,7 @@ static int _mt_smp_get_core_count(void)
}
#endif //#if !defined(CONFIG_OF)
-void __cpuinit mt_smp_secondary_init(unsigned int cpu)
+void mt_smp_secondary_init(unsigned int cpu)
{
#if 0
struct wd_api *wd_api = NULL;
@@ -138,7 +138,7 @@ void __cpuinit mt_smp_secondary_init(unsigned int cpu)
spin_unlock(&boot_lock);
}
-int __cpuinit mt_smp_boot_secondary(unsigned int cpu, struct task_struct *idle)
+int mt_smp_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
unsigned long timeout;
diff --git a/drivers/misc/mediatek/mach/mt6735/mt_cpufreq.c b/drivers/misc/mediatek/mach/mt6735/mt_cpufreq.c
index 5f8e4e71e..5142f6f04 100644
--- a/drivers/misc/mediatek/mach/mt6735/mt_cpufreq.c
+++ b/drivers/misc/mediatek/mach/mt6735/mt_cpufreq.c
@@ -492,7 +492,7 @@ static int _mt_cpufreq_set_cur_volt_extbuck(struct mt_cpu_dvfs *p, unsigned int
#endif
/* CPU callback */
-static int __cpuinit _mt_cpufreq_cpu_CB(struct notifier_block *nfb, unsigned long action, void *hcpu);
+static int _mt_cpufreq_cpu_CB(struct notifier_block *nfb, unsigned long action, void *hcpu);
/* cpufreq driver */
#ifdef CONFIG_CPU_FREQ
@@ -2702,7 +2702,7 @@ static void _mt_cpufreq_set(enum mt_cpu_dvfs_id id, int new_opp_idx)
FUNC_EXIT(FUNC_LV_LOCAL);
}
-static int __cpuinit _mt_cpufreq_cpu_CB(struct notifier_block *nfb, unsigned long action, void *hcpu)
+static int _mt_cpufreq_cpu_CB(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
unsigned int online_cpus = num_online_cpus();
diff --git a/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_algo.c b/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_algo.c
index aae6cbe19..cac3539d8 100644
--- a/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_algo.c
+++ b/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_algo.c
@@ -65,7 +65,7 @@
/*
* hps algo - hmp
*/
-void __cpuinit hps_algo_hmp(void)
+void hps_algo_hmp(void)
{
unsigned int cpu;
unsigned int val;
@@ -512,7 +512,7 @@ ALGO_END_WO_ACTION:
/*
* hps algo - smp
*/
-void __cpuinit hps_algo_smp(void)
+void hps_algo_smp(void)
{
unsigned int cpu;
unsigned int val;
diff --git a/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_core.c b/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_core.c
index 3b926b208..520b8b0a7 100644
--- a/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_core.c
+++ b/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_core.c
@@ -60,7 +60,7 @@
/*
* hps task main loop
*/
-static int __cpuinit _hps_task_main(void *data)
+static int _hps_task_main(void *data)
{
int cnt = 0;
void (*algo_func_ptr)(void);
@@ -104,7 +104,7 @@ static int __cpuinit _hps_task_main(void *data)
/*
* hps task control interface
*/
-int __cpuinit hps_task_start(void)
+int hps_task_start(void)
{
struct sched_param param = { .sched_priority = HPS_TASK_PRIORITY };
@@ -158,7 +158,7 @@ void hps_task_wakeup(void)
/*
* init
*/
-int __cpuinit hps_core_init(void)
+int hps_core_init(void)
{
int r = 0;
diff --git a/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_main.c b/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_main.c
index 176560176..1783f45b0 100644
--- a/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_main.c
+++ b/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_main.c
@@ -497,7 +497,7 @@ suspend_end:
/*
* resume callback
*/
-static int __cpuinit hps_resume(struct device *dev)
+static int hps_resume(struct device *dev)
{
unsigned int cpu,little_cpu_num_resume;
hps_warn("%s\n", __func__);
diff --git a/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_procfs.c b/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_procfs.c
index 510ed9be3..33d4ceba5 100644
--- a/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_procfs.c
+++ b/drivers/misc/mediatek/mach/mt6735/mt_hotplug_strategy_procfs.c
@@ -821,7 +821,7 @@ static int hps_test1_proc_show(struct seq_file *m, void *v)
return 0;
}
-static int __cpuinit hps_test1_proc_write(struct file *file, const char __user *buffer, size_t count, loff_t *pos)
+static int hps_test1_proc_write(struct file *file, const char __user *buffer, size_t count, loff_t *pos)
{
int len = 0, test1 = 0;
char desc[32];
diff --git a/drivers/misc/mediatek/watchpoint/mt6735/aarch32/mt_dbg_aarch32.c b/drivers/misc/mediatek/watchpoint/mt6735/aarch32/mt_dbg_aarch32.c
index d90da8551..1170e1af3 100644
--- a/drivers/misc/mediatek/watchpoint/mt6735/aarch32/mt_dbg_aarch32.c
+++ b/drivers/misc/mediatek/watchpoint/mt6735/aarch32/mt_dbg_aarch32.c
@@ -278,7 +278,7 @@ void mt_copy_dbg_regs(int to, int from)
#ifdef CONFIG_SMP
-int __cpuinit
+int
dbgregs_hotplug_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
unsigned int this_cpu = (unsigned int) hcpu;
@@ -338,7 +338,7 @@ dbgregs_hotplug_callback(struct notifier_block *nfb, unsigned long action, void
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata cpu_nfb = {
+static struct notifier_block cpu_nfb = {
.notifier_call = dbgregs_hotplug_callback
};
diff --git a/drivers/misc/mediatek/watchpoint/mt6735/aarch64/mt_dbg_aarch64.c b/drivers/misc/mediatek/watchpoint/mt6735/aarch64/mt_dbg_aarch64.c
index b0e90d36b..95f20c712 100644
--- a/drivers/misc/mediatek/watchpoint/mt6735/aarch64/mt_dbg_aarch64.c
+++ b/drivers/misc/mediatek/watchpoint/mt6735/aarch64/mt_dbg_aarch64.c
@@ -305,7 +305,7 @@ void mt_copy_dbg_regs(int to, int from)
#ifdef CONFIG_SMP
-int __cpuinit
+int
dbgregs_hotplug_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
unsigned long this_cpu = (unsigned long) hcpu;
@@ -366,7 +366,7 @@ dbgregs_hotplug_callback(struct notifier_block *nfb, unsigned long action, void
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata cpu_nfb = {
+static struct notifier_block cpu_nfb = {
.notifier_call = dbgregs_hotplug_callback
};
diff --git a/drivers/misc/mediatek/wdk/timer_test.c b/drivers/misc/mediatek/wdk/timer_test.c
index eb7bfd273..9fed2743a 100644
--- a/drivers/misc/mediatek/wdk/timer_test.c
+++ b/drivers/misc/mediatek/wdk/timer_test.c
@@ -86,7 +86,7 @@ static int data;
static int hrtimer_test_case();
-static int __cpuinit
+static int
cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
int hotcpu = (unsigned long)hcpu;
@@ -125,7 +125,7 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
return NOTIFY_OK;
}
-static struct notifier_block __cpuinitdata cpu_nfb = {
+static struct notifier_block cpu_nfb = {
.notifier_call = cpu_callback
};
diff --git a/drivers/misc/mediatek/wdk/wd_common_drv.c b/drivers/misc/mediatek/wdk/wd_common_drv.c
index 9e392825d..e9fbf4fea 100644
--- a/drivers/misc/mediatek/wdk/wd_common_drv.c
+++ b/drivers/misc/mediatek/wdk/wd_common_drv.c
@@ -544,7 +544,7 @@ ssize_t mtk_rgu_pause_wdt_store(struct kobject *kobj, const char *buffer, size_t
#endif /*__ENABLE_WDT_SYSFS__*/
/*---------------------------------------------------------------------------*/
-static int __cpuinit wk_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
+static int wk_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
int hotcpu = (unsigned long)hcpu;
@@ -598,7 +598,7 @@ static int __cpuinit wk_cpu_callback(struct notifier_block *nfb, unsigned long a
return NOTIFY_OK;
}
-static struct notifier_block cpu_nfb __cpuinitdata = {
+static struct notifier_block cpu_nfb = {
.notifier_call = wk_cpu_callback,
.priority = 6
};
diff --git a/drivers/misc/mediatek/wdk/wdt_test.c b/drivers/misc/mediatek/wdk/wdt_test.c
index f12bcfe1e..7797f71f9 100644
--- a/drivers/misc/mediatek/wdk/wdt_test.c
+++ b/drivers/misc/mediatek/wdk/wdt_test.c
@@ -86,7 +86,7 @@ static void wdt_dump_reg(void)
}
-static int __cpuinit cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
+static int cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
int hotcpu = (unsigned long)hcpu;
@@ -123,7 +123,7 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb, unsigned long acti
return NOTIFY_OK;
}
-static struct notifier_block cpu_nfb __cpuinitdata = {
+static struct notifier_block cpu_nfb = {
.notifier_call = cpu_callback
};