Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mach-s3c2410/cpu-freq.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -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) 




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) 
	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

+3 −2
Original line number Original line Diff line number Diff line
@@ -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 = { 




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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

+2 −1
Original line number Original line Diff line number Diff line
@@ -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;