Skip to content

L
linux
Commit 04511a6f authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kukjin Kim
Browse files
Options

ARM: SAMSUNG: Fix missing api-change from subsys_interface change 

Commit 4a858cfc (arm: convert sysdev_class to a regular subsystem)
converted the samsung sysdevs into subsys_interface instances.

While the original add-function only had a (struct sys_device *)
parameter, the dev_add from subsys_interface needs
	(struct device *, struct subsys_interface *)
leading to "initialized from incompatible pointer type" warnings.
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 9a60571e
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 26 deletions
arch/arm/mach-s3c2410/cpu-freq.c
View file @ 04511a6f
...@@ -115,7 +115,8 @@ static struct s3c_cpufreq_info s3c2410_cpufreq_info = { ...@@ -115,7 +115,8 @@ static struct s3c_cpufreq_info s3c2410_cpufreq_info = {
.debug_io_show = s3c_cpufreq_debugfs_call(s3c2410_iotiming_debugfs), .debug_io_show = s3c_cpufreq_debugfs_call(s3c2410_iotiming_debugfs),
}; };
static int s3c2410_cpufreq_add(struct device *dev) static int s3c2410_cpufreq_add(struct device *dev,
struct subsys_interface *sif)
{ {
return s3c_cpufreq_register(&s3c2410_cpufreq_info); return s3c_cpufreq_register(&s3c2410_cpufreq_info);
} }
...@@ -133,7 +134,8 @@ static int __init s3c2410_cpufreq_init(void) ...@@ -133,7 +134,8 @@ static int __init s3c2410_cpufreq_init(void)
arch_initcall(s3c2410_cpufreq_init); arch_initcall(s3c2410_cpufreq_init);
static int s3c2410a_cpufreq_add(struct device *dev) static int s3c2410a_cpufreq_add(struct device *dev,
struct subsys_interface *sif)
{ {
/* alter the maximum freq settings for S3C2410A. If a board knows /* alter the maximum freq settings for S3C2410A. If a board knows
* it only has a maximum of 200, then it should register its own * it only has a maximum of 200, then it should register its own
...@@ -144,7 +146,7 @@ static int s3c2410a_cpufreq_add(struct device *dev) ...@@ -144,7 +146,7 @@ static int s3c2410a_cpufreq_add(struct device *dev)
s3c2410_cpufreq_info.max.pclk = 66500000; s3c2410_cpufreq_info.max.pclk = 66500000;
s3c2410_cpufreq_info.name = "s3c2410a"; s3c2410_cpufreq_info.name = "s3c2410a";
return s3c2410_cpufreq_add(dev); return s3c2410_cpufreq_add(dev, sif);
} }
static struct subsys_interface s3c2410a_cpufreq_interface = { static struct subsys_interface s3c2410a_cpufreq_interface = {
......
arch/arm/mach-s3c2410/dma.c
View file @ 04511a6f
...@@ -132,7 +132,8 @@ static struct s3c24xx_dma_order __initdata s3c2410_dma_order = { ...@@ -132,7 +132,8 @@ static struct s3c24xx_dma_order __initdata s3c2410_dma_order = {
}, },
}; };
static int __init s3c2410_dma_add(struct device *dev) static int __init s3c2410_dma_add(struct device *dev,
struct subsys_interface *sif)
{ {
s3c2410_dma_init(); s3c2410_dma_init();
s3c24xx_dma_order_set(&s3c2410_dma_order); s3c24xx_dma_order_set(&s3c2410_dma_order);
...@@ -148,7 +149,7 @@ static struct subsys_interface s3c2410_dma_interface = { ...@@ -148,7 +149,7 @@ static struct subsys_interface s3c2410_dma_interface = {
static int __init s3c2410_dma_drvinit(void) static int __init s3c2410_dma_drvinit(void)
{ {
return subsys_interface_register(&s3c2410_interface); return subsys_interface_register(&s3c2410_dma_interface);
} }
arch_initcall(s3c2410_dma_drvinit); arch_initcall(s3c2410_dma_drvinit);
......
arch/arm/mach-s3c2410/pll.c
View file @ 04511a6f
...@@ -66,7 +66,7 @@ static struct cpufreq_frequency_table pll_vals_12MHz[] = { ...@@ -66,7 +66,7 @@ static struct cpufreq_frequency_table pll_vals_12MHz[] = {
{ .frequency = 270000000, .index = PLLVAL(127, 1, 1), }, { .frequency = 270000000, .index = PLLVAL(127, 1, 1), },
}; };
static int s3c2410_plls_add(struct device *dev) static int s3c2410_plls_add(struct device *dev, struct subsys_interface *sif)
{ {
return s3c_plltab_register(pll_vals_12MHz, ARRAY_SIZE(pll_vals_12MHz)); return s3c_plltab_register(pll_vals_12MHz, ARRAY_SIZE(pll_vals_12MHz));
} }
......
arch/arm/mach-s3c2410/pm.c
View file @ 04511a6f
...@@ -111,7 +111,7 @@ struct syscore_ops s3c2410_pm_syscore_ops = { ...@@ -111,7 +111,7 @@ struct syscore_ops s3c2410_pm_syscore_ops = {
.resume = s3c2410_pm_resume, .resume = s3c2410_pm_resume,
}; };
static int s3c2410_pm_add(struct device *dev) static int s3c2410_pm_add(struct device *dev, struct subsys_interface *sif)
{ {
pm_cpu_prep = s3c2410_pm_prepare; pm_cpu_prep = s3c2410_pm_prepare;
pm_cpu_sleep = s3c2410_cpu_suspend; pm_cpu_sleep = s3c2410_cpu_suspend;
......
arch/arm/mach-s3c2412/cpu-freq.c
View file @ 04511a6f
...@@ -194,7 +194,8 @@ static struct s3c_cpufreq_info s3c2412_cpufreq_info = { ...@@ -194,7 +194,8 @@ static struct s3c_cpufreq_info s3c2412_cpufreq_info = {
.debug_io_show = s3c_cpufreq_debugfs_call(s3c2412_iotiming_debugfs), .debug_io_show = s3c_cpufreq_debugfs_call(s3c2412_iotiming_debugfs),
}; };
static int s3c2412_cpufreq_add(struct device *dev) static int s3c2412_cpufreq_add(struct device *dev,
struct subsys_interface *sif)
{ {
unsigned long fclk_rate; unsigned long fclk_rate;
......
arch/arm/mach-s3c2412/dma.c
View file @ 04511a6f
...@@ -159,7 +159,8 @@ static struct s3c24xx_dma_selection __initdata s3c2412_dma_sel = { ...@@ -159,7 +159,8 @@ static struct s3c24xx_dma_selection __initdata s3c2412_dma_sel = {
.map_size = ARRAY_SIZE(s3c2412_dma_mappings), .map_size = ARRAY_SIZE(s3c2412_dma_mappings),
}; };
static int __init s3c2412_dma_add(struct device *dev) static int __init s3c2412_dma_add(struct device *dev,
struct subsys_interface *sif)
{ {
s3c2410_dma_init(); s3c2410_dma_init();
return s3c24xx_dma_init_map(&s3c2412_dma_sel); return s3c24xx_dma_init_map(&s3c2412_dma_sel);
......
arch/arm/mach-s3c2412/irq.c
View file @ 04511a6f
...@@ -170,7 +170,7 @@ static int s3c2412_irq_rtc_wake(struct irq_data *data, unsigned int state) ...@@ -170,7 +170,7 @@ static int s3c2412_irq_rtc_wake(struct irq_data *data, unsigned int state)
static struct irq_chip s3c2412_irq_rtc_chip; static struct irq_chip s3c2412_irq_rtc_chip;
static int s3c2412_irq_add(struct device *dev) static int s3c2412_irq_add(struct device *dev, struct subsys_interface *sif)
{ {
unsigned int irqno; unsigned int irqno;
......
arch/arm/mach-s3c2412/pm.c
View file @ 04511a6f
...@@ -56,7 +56,7 @@ static void s3c2412_pm_prepare(void) ...@@ -56,7 +56,7 @@ static void s3c2412_pm_prepare(void)
{ {
} }
static int s3c2412_pm_add(struct device *dev) static int s3c2412_pm_add(struct device *dev, struct subsys_interface *sif)
{ {
pm_cpu_prep = s3c2412_pm_prepare; pm_cpu_prep = s3c2412_pm_prepare;
pm_cpu_sleep = s3c2412_cpu_suspend; pm_cpu_sleep = s3c2412_cpu_suspend;
......
arch/arm/mach-s3c2416/irq.c
View file @ 04511a6f
...@@ -213,7 +213,8 @@ static int __init s3c2416_add_sub(unsigned int base, ...@@ -213,7 +213,8 @@ static int __init s3c2416_add_sub(unsigned int base,
return 0; return 0;
} }
static int __init s3c2416_irq_add(struct device *dev) static int __init s3c2416_irq_add(struct device *dev,
struct subsys_interface *sif)
{ {
printk(KERN_INFO "S3C2416: IRQ Support\n"); printk(KERN_INFO "S3C2416: IRQ Support\n");
......
arch/arm/mach-s3c2416/pm.c
View file @ 04511a6f
...@@ -48,7 +48,7 @@ static void s3c2416_pm_prepare(void) ...@@ -48,7 +48,7 @@ static void s3c2416_pm_prepare(void)
__raw_writel(virt_to_phys(s3c_cpu_resume), S3C2412_INFORM1); __raw_writel(virt_to_phys(s3c_cpu_resume), S3C2412_INFORM1);
} }
static int s3c2416_pm_add(struct device *dev) static int s3c2416_pm_add(struct device *dev, struct subsys_interface *sif)
{ {
pm_cpu_prep = s3c2416_pm_prepare; pm_cpu_prep = s3c2416_pm_prepare;
pm_cpu_sleep = s3c2416_cpu_suspend; pm_cpu_sleep = s3c2416_cpu_suspend;
......
arch/arm/mach-s3c2440/clock.c
View file @ 04511a6f
...@@ -149,7 +149,7 @@ static struct clk_lookup s3c2440_clk_lookup[] = { ...@@ -149,7 +149,7 @@ static struct clk_lookup s3c2440_clk_lookup[] = {
CLKDEV_INIT(NULL, "clk_uart_baud3", &s3c2440_clk_fclk_n), CLKDEV_INIT(NULL, "clk_uart_baud3", &s3c2440_clk_fclk_n),
}; };
static int s3c2440_clk_add(struct device *dev) static int s3c2440_clk_add(struct device *dev, struct subsys_interface *sif)
{ {
struct clk *clock_upll; struct clk *clock_upll;
struct clk *clock_h; struct clk *clock_h;
......
arch/arm/mach-s3c2440/dma.c
View file @ 04511a6f
...@@ -174,7 +174,8 @@ static struct s3c24xx_dma_order __initdata s3c2440_dma_order = { ...@@ -174,7 +174,8 @@ static struct s3c24xx_dma_order __initdata s3c2440_dma_order = {
}, },
}; };
static int __init s3c2440_dma_add(struct device *dev) static int __init s3c2440_dma_add(struct device *dev,
struct subsys_interface *sif)
{ {
s3c2410_dma_init(); s3c2410_dma_init();
s3c24xx_dma_order_set(&s3c2440_dma_order); s3c24xx_dma_order_set(&s3c2440_dma_order);
......
arch/arm/mach-s3c2440/irq.c
View file @ 04511a6f
...@@ -92,7 +92,7 @@ static struct irq_chip s3c_irq_wdtac97 = { ...@@ -92,7 +92,7 @@ static struct irq_chip s3c_irq_wdtac97 = {
.irq_ack = s3c_irq_wdtac97_ack, .irq_ack = s3c_irq_wdtac97_ack,
}; };
static int s3c2440_irq_add(struct device *dev) static int s3c2440_irq_add(struct device *dev, struct subsys_interface *sif)
{ {
unsigned int irqno; unsigned int irqno;
......
arch/arm/mach-s3c2440/s3c2440-cpufreq.c
View file @ 04511a6f
...@@ -270,7 +270,8 @@ struct s3c_cpufreq_info s3c2440_cpufreq_info = { ...@@ -270,7 +270,8 @@ struct s3c_cpufreq_info s3c2440_cpufreq_info = {
.debug_io_show = s3c_cpufreq_debugfs_call(s3c2410_iotiming_debugfs), .debug_io_show = s3c_cpufreq_debugfs_call(s3c2410_iotiming_debugfs),
}; };
static int s3c2440_cpufreq_add(struct device *dev) static int s3c2440_cpufreq_add(struct device *dev,
struct subsys_interface *sif)
{ {
xtal = s3c_cpufreq_clk_get(NULL, "xtal"); xtal = s3c_cpufreq_clk_get(NULL, "xtal");
hclk = s3c_cpufreq_clk_get(NULL, "hclk"); hclk = s3c_cpufreq_clk_get(NULL, "hclk");
......
arch/arm/mach-s3c2440/s3c2440-pll-12000000.c
View file @ 04511a6f
...@@ -51,7 +51,7 @@ static struct cpufreq_frequency_table s3c2440_plls_12[] __initdata = { ...@@ -51,7 +51,7 @@ static struct cpufreq_frequency_table s3c2440_plls_12[] __initdata = {
{ .frequency = 400000000, .index = PLLVAL(0x5c, 1, 1), }, /* FVco 800.000000 */ { .frequency = 400000000, .index = PLLVAL(0x5c, 1, 1), }, /* FVco 800.000000 */
}; };
static int s3c2440_plls12_add(struct device *dev) static int s3c2440_plls12_add(struct device *dev, struct subsys_interface *sif)
{ {
struct clk *xtal_clk; struct clk *xtal_clk;
unsigned long xtal; unsigned long xtal;
......
arch/arm/mach-s3c2440/s3c2440-pll-16934400.c
View file @ 04511a6f
...@@ -79,7 +79,8 @@ static struct cpufreq_frequency_table s3c2440_plls_169344[] __initdata = { ...@@ -79,7 +79,8 @@ static struct cpufreq_frequency_table s3c2440_plls_169344[] __initdata = {
{ .frequency = 402192000, .index = PLLVAL(87, 2, 1), }, /* FVco 804.384000 */ { .frequency = 402192000, .index = PLLVAL(87, 2, 1), }, /* FVco 804.384000 */
}; };
static int s3c2440_plls169344_add(struct device *dev) static int s3c2440_plls169344_add(struct device *dev,
struct subsys_interface *sif)
{ {
struct clk *xtal_clk; struct clk *xtal_clk;
unsigned long xtal; unsigned long xtal;
......
arch/arm/mach-s3c2440/s3c2442.c
View file @ 04511a6f
...@@ -122,7 +122,7 @@ static struct clk s3c2442_clk_cam_upll = { ...@@ -122,7 +122,7 @@ static struct clk s3c2442_clk_cam_upll = {
}, },
}; };
static int s3c2442_clk_add(struct device *dev) static int s3c2442_clk_add(struct device *dev, struct subsys_interface *sif)
{ {
struct clk *clock_upll; struct clk *clock_upll;
struct clk *clock_h; struct clk *clock_h;
......
arch/arm/mach-s3c2440/s3c244x-clock.c
View file @ 04511a6f
...@@ -72,7 +72,7 @@ static struct clk clk_arm = { ...@@ -72,7 +72,7 @@ static struct clk clk_arm = {
}, },
}; };
static int s3c244x_clk_add(struct device *dev) static int s3c244x_clk_add(struct device *dev, struct subsys_interface *sif)
{ {
unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN); unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN);
unsigned long clkdivn; unsigned long clkdivn;
......
arch/arm/mach-s3c2440/s3c244x-irq.c
View file @ 04511a6f
...@@ -91,7 +91,7 @@ static struct irq_chip s3c_irq_cam = { ...@@ -91,7 +91,7 @@ static struct irq_chip s3c_irq_cam = {
.irq_ack = s3c_irq_cam_ack, .irq_ack = s3c_irq_cam_ack,
}; };
static int s3c244x_irq_add(struct device *dev) static int s3c244x_irq_add(struct device *dev, struct subsys_interface *sif)
{ {
unsigned int irqno; unsigned int irqno;
......
arch/arm/mach-s3c2443/dma.c
View file @ 04511a6f
...@@ -135,7 +135,8 @@ static struct s3c24xx_dma_selection __initdata s3c2443_dma_sel = { ...@@ -135,7 +135,8 @@ static struct s3c24xx_dma_selection __initdata s3c2443_dma_sel = {
.map_size = ARRAY_SIZE(s3c2443_dma_mappings), .map_size = ARRAY_SIZE(s3c2443_dma_mappings),
}; };
static int __init s3c2443_dma_add(struct device *dev) static int __init s3c2443_dma_add(struct device *dev,
struct subsys_interface *sif)
{ {
s3c24xx_dma_init(6, IRQ_S3C2443_DMA0, 0x100); s3c24xx_dma_init(6, IRQ_S3C2443_DMA0, 0x100);
return s3c24xx_dma_init_map(&s3c2443_dma_sel); return s3c24xx_dma_init_map(&s3c2443_dma_sel);
......
arch/arm/mach-s3c2443/irq.c
View file @ 04511a6f
...@@ -241,7 +241,8 @@ static int __init s3c2443_add_sub(unsigned int base, ...@@ -241,7 +241,8 @@ static int __init s3c2443_add_sub(unsigned int base,
return 0; return 0;
} }
static int __init s3c2443_irq_add(struct device *dev) static int __init s3c2443_irq_add(struct device *dev,
struct subsys_interface *sif)
{ {
printk("S3C2443: IRQ Support\n"); printk("S3C2443: IRQ Support\n");
......
arch/arm/mach-s5p64x0/pm.c
View file @ 04511a6f
...@@ -160,7 +160,7 @@ static void s5p64x0_pm_prepare(void) ...@@ -160,7 +160,7 @@ static void s5p64x0_pm_prepare(void)
} }
static int s5p64x0_pm_add(struct device *dev) static int s5p64x0_pm_add(struct device *dev, struct subsys_interface *sif)
{ {
pm_cpu_prep = s5p64x0_pm_prepare; pm_cpu_prep = s5p64x0_pm_prepare;
pm_cpu_sleep = s5p64x0_cpu_suspend; pm_cpu_sleep = s5p64x0_cpu_suspend;
......
arch/arm/mach-s5pv210/pm.c
View file @ 04511a6f
...@@ -133,7 +133,7 @@ static void s5pv210_pm_prepare(void) ...@@ -133,7 +133,7 @@ static void s5pv210_pm_prepare(void)
s3c_pm_do_save(s5pv210_core_save, ARRAY_SIZE(s5pv210_core_save)); s3c_pm_do_save(s5pv210_core_save, ARRAY_SIZE(s5pv210_core_save));
} }
static int s5pv210_pm_add(struct device *dev) static int s5pv210_pm_add(struct device *dev, struct subsys_interface *sif)
{ {
pm_cpu_prep = s5pv210_pm_prepare; pm_cpu_prep = s5pv210_pm_prepare;
pm_cpu_sleep = s5pv210_cpu_suspend; pm_cpu_sleep = s5pv210_cpu_suspend;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7