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

Commit b464e3cb authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Sekhar Nori
Browse files

ARM: davinci: remove __init atrribute from function declaration 



__init attribute does not make sense on function declarations.
Get rid of them in mach-davinci.

Signed-off-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Cc: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent d683b96b

arch/arm/mach-davinci/davinci.h

+14 −14
Original line number Original line Diff line number Diff line
@@ -77,32 +77,32 @@ void davinci_map_sysmod(void); 
#define DM646X_ASYNC_EMIF_CS2_SPACE_BASE 0x42000000

#define DM646X_ASYNC_EMIF_CS2_SPACE_BASE 0x42000000





/* DM355 function declarations */

/* DM355 function declarations */

void __init dm355_init(void);

void dm355_init(void);

void dm355_init_spi0(unsigned chipselect_mask,

void dm355_init_spi0(unsigned chipselect_mask,

		const struct spi_board_info *info, unsigned len);

		const struct spi_board_info *info, unsigned len);

void __init dm355_init_asp1(u32 evt_enable, struct snd_platform_data *pdata);

void dm355_init_asp1(u32 evt_enable, struct snd_platform_data *pdata);

int dm355_init_video(struct vpfe_config *, struct vpbe_config *);

int dm355_init_video(struct vpfe_config *, struct vpbe_config *);





/* DM365 function declarations */

/* DM365 function declarations */

void __init dm365_init(void);

void dm365_init(void);

void __init dm365_init_asp(struct snd_platform_data *pdata);

void dm365_init_asp(struct snd_platform_data *pdata);

void __init dm365_init_vc(struct snd_platform_data *pdata);

void dm365_init_vc(struct snd_platform_data *pdata);

void __init dm365_init_ks(struct davinci_ks_platform_data *pdata);

void dm365_init_ks(struct davinci_ks_platform_data *pdata);

void __init dm365_init_rtc(void);

void dm365_init_rtc(void);

void dm365_init_spi0(unsigned chipselect_mask,

void dm365_init_spi0(unsigned chipselect_mask,

			const struct spi_board_info *info, unsigned len);

			const struct spi_board_info *info, unsigned len);

int dm365_init_video(struct vpfe_config *, struct vpbe_config *);

int dm365_init_video(struct vpfe_config *, struct vpbe_config *);





/* DM644x function declarations */

/* DM644x function declarations */

void __init dm644x_init(void);

void dm644x_init(void);

void __init dm644x_init_asp(struct snd_platform_data *pdata);

void dm644x_init_asp(struct snd_platform_data *pdata);

int __init dm644x_init_video(struct vpfe_config *, struct vpbe_config *);

int dm644x_init_video(struct vpfe_config *, struct vpbe_config *);





/* DM646x function declarations */

/* DM646x function declarations */

void __init dm646x_init(void);

void dm646x_init(void);

void __init dm646x_init_mcasp0(struct snd_platform_data *pdata);

void dm646x_init_mcasp0(struct snd_platform_data *pdata);

void __init dm646x_init_mcasp1(struct snd_platform_data *pdata);

void dm646x_init_mcasp1(struct snd_platform_data *pdata);

int __init dm646x_init_edma(struct edma_rsv_info *rsv);

int dm646x_init_edma(struct edma_rsv_info *rsv);

void dm646x_video_init(void);

void dm646x_video_init(void);

void dm646x_setup_vpif(struct vpif_display_config *,

void dm646x_setup_vpif(struct vpif_display_config *,

		       struct vpif_capture_config *);

		       struct vpif_capture_config *);

arch/arm/mach-davinci/include/mach/cp_intc.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ 
#define CP_INTC_HOST_PRIO_VECTOR(n)	(0x1600 + (n << 2))

#define CP_INTC_HOST_PRIO_VECTOR(n)	(0x1600 + (n << 2))

#define CP_INTC_VECTOR_ADDR(n)		(0x2000 + (n << 2))

#define CP_INTC_VECTOR_ADDR(n)		(0x2000 + (n << 2))





void __init cp_intc_init(void);

void cp_intc_init(void);

int __init cp_intc_of_init(struct device_node *, struct device_node *);

int cp_intc_of_init(struct device_node *, struct device_node *);





#endif	/* __ASM_HARDWARE_CP_INTC_H */
 
#endif	/* __ASM_HARDWARE_CP_INTC_H */

arch/arm/mach-davinci/include/mach/da8xx.h

+8 −8
Original line number Original line Diff line number Diff line
@@ -79,8 +79,8 @@ extern unsigned int da850_max_speed; 
#define DA8XX_SHARED_RAM_BASE	0x80000000

#define DA8XX_SHARED_RAM_BASE	0x80000000

#define DA8XX_ARM_RAM_BASE	0xffff0000

#define DA8XX_ARM_RAM_BASE	0xffff0000





void __init da830_init(void);

void da830_init(void);

void __init da850_init(void);

void da850_init(void);





int da830_register_edma(struct edma_rsv_info *rsv);

int da830_register_edma(struct edma_rsv_info *rsv);

int da850_register_edma(struct edma_rsv_info *rsv[2]);

int da850_register_edma(struct edma_rsv_info *rsv[2]);
@@ -94,17 +94,17 @@ int da8xx_register_uio_pruss(void); 
int da8xx_register_lcdc(struct da8xx_lcdc_platform_data *pdata);

int da8xx_register_lcdc(struct da8xx_lcdc_platform_data *pdata);

int da8xx_register_mmcsd0(struct davinci_mmc_config *config);

int da8xx_register_mmcsd0(struct davinci_mmc_config *config);

int da850_register_mmcsd1(struct davinci_mmc_config *config);

int da850_register_mmcsd1(struct davinci_mmc_config *config);

void __init da8xx_register_mcasp(int id, struct snd_platform_data *pdata);

void da8xx_register_mcasp(int id, struct snd_platform_data *pdata);

int da8xx_register_rtc(void);

int da8xx_register_rtc(void);

int da850_register_cpufreq(char *async_clk);

int da850_register_cpufreq(char *async_clk);

int da8xx_register_cpuidle(void);

int da8xx_register_cpuidle(void);

void __iomem * __init da8xx_get_mem_ctlr(void);

void __iomem *da8xx_get_mem_ctlr(void);

int da850_register_pm(struct platform_device *pdev);

int da850_register_pm(struct platform_device *pdev);

int __init da850_register_sata(unsigned long refclkpn);

int da850_register_sata(unsigned long refclkpn);

int __init da850_register_vpif(void);

int da850_register_vpif(void);

int __init da850_register_vpif_display

int da850_register_vpif_display

			(struct vpif_display_config *display_config);

			(struct vpif_display_config *display_config);

int __init da850_register_vpif_capture

int da850_register_vpif_capture

			(struct vpif_capture_config *capture_config);

			(struct vpif_capture_config *capture_config);

void da8xx_restart(char mode, const char *cmd);

void da8xx_restart(char mode, const char *cmd);

void da8xx_rproc_reserve_cma(void);

void da8xx_rproc_reserve_cma(void);

arch/arm/mach-davinci/include/mach/tnetv107x.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -51,9 +51,9 @@ struct tnetv107x_device_info { 
extern struct platform_device tnetv107x_wdt_device;

extern struct platform_device tnetv107x_wdt_device;

extern struct platform_device tnetv107x_serial_device;

extern struct platform_device tnetv107x_serial_device;





extern void __init tnetv107x_init(void);

extern void tnetv107x_init(void);

extern void __init tnetv107x_devices_init(struct tnetv107x_device_info *);

extern void tnetv107x_devices_init(struct tnetv107x_device_info *);

extern void __init tnetv107x_irq_init(void);

extern void tnetv107x_irq_init(void);

void tnetv107x_restart(char mode, const char *cmd);

void tnetv107x_restart(char mode, const char *cmd);





#endif

#endif