Commit 7e198197 authored by Brian Norris's avatar Brian Norris Committed by Anatolij Gustschin

powerpc/mpc512x: remove unnecessary #if

Several functions are only ever referenced locally, so make them static.
Of those functions, many of them are protected by an #if. However, the
code which can compile fine in either case.

Now that (1) the unneeded code is marked 'static' and (2) the code is
only used under a C 'if (IS_ENABLED(CONFIG_FB_FSL_DIU))', the compiler
can automatically remove the unneeded code, and we don't need the #if or
the empty stub functions.
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Signed-off-by: default avatarAnatolij Gustschin <agust@denx.de>
parent 2bf75084
...@@ -60,8 +60,6 @@ void mpc512x_restart(char *cmd) ...@@ -60,8 +60,6 @@ void mpc512x_restart(char *cmd)
; ;
} }
#if IS_ENABLED(CONFIG_FB_FSL_DIU)
struct fsl_diu_shared_fb { struct fsl_diu_shared_fb {
u8 gamma[0x300]; /* 32-bit aligned! */ u8 gamma[0x300]; /* 32-bit aligned! */
struct diu_ad ad0; /* 32-bit aligned! */ struct diu_ad ad0; /* 32-bit aligned! */
...@@ -71,7 +69,7 @@ struct fsl_diu_shared_fb { ...@@ -71,7 +69,7 @@ struct fsl_diu_shared_fb {
}; };
#define DIU_DIV_MASK 0x000000ff #define DIU_DIV_MASK 0x000000ff
void mpc512x_set_pixel_clock(unsigned int pixclock) static void mpc512x_set_pixel_clock(unsigned int pixclock)
{ {
unsigned long bestval, bestfreq, speed, busfreq; unsigned long bestval, bestfreq, speed, busfreq;
unsigned long minpixclock, maxpixclock, pixval; unsigned long minpixclock, maxpixclock, pixval;
...@@ -164,7 +162,7 @@ void mpc512x_set_pixel_clock(unsigned int pixclock) ...@@ -164,7 +162,7 @@ void mpc512x_set_pixel_clock(unsigned int pixclock)
iounmap(ccm); iounmap(ccm);
} }
enum fsl_diu_monitor_port static enum fsl_diu_monitor_port
mpc512x_valid_monitor_port(enum fsl_diu_monitor_port port) mpc512x_valid_monitor_port(enum fsl_diu_monitor_port port)
{ {
return FSL_DIU_PORT_DVI; return FSL_DIU_PORT_DVI;
...@@ -179,7 +177,7 @@ static inline void mpc512x_free_bootmem(struct page *page) ...@@ -179,7 +177,7 @@ static inline void mpc512x_free_bootmem(struct page *page)
free_reserved_page(page); free_reserved_page(page);
} }
void mpc512x_release_bootmem(void) static void mpc512x_release_bootmem(void)
{ {
unsigned long addr = diu_shared_fb.fb_phys & PAGE_MASK; unsigned long addr = diu_shared_fb.fb_phys & PAGE_MASK;
unsigned long size = diu_shared_fb.fb_len; unsigned long size = diu_shared_fb.fb_len;
...@@ -205,7 +203,7 @@ void mpc512x_release_bootmem(void) ...@@ -205,7 +203,7 @@ void mpc512x_release_bootmem(void)
* address range will be reserved in setup_arch() after bootmem * address range will be reserved in setup_arch() after bootmem
* allocator is up. * allocator is up.
*/ */
void __init mpc512x_init_diu(void) static void __init mpc512x_init_diu(void)
{ {
struct device_node *np; struct device_node *np;
struct diu __iomem *diu_reg; struct diu __iomem *diu_reg;
...@@ -274,7 +272,7 @@ void __init mpc512x_init_diu(void) ...@@ -274,7 +272,7 @@ void __init mpc512x_init_diu(void)
iounmap(diu_reg); iounmap(diu_reg);
} }
void __init mpc512x_setup_diu(void) static void __init mpc512x_setup_diu(void)
{ {
int ret; int ret;
...@@ -303,11 +301,6 @@ void __init mpc512x_setup_diu(void) ...@@ -303,11 +301,6 @@ void __init mpc512x_setup_diu(void)
diu_ops.release_bootmem = mpc512x_release_bootmem; diu_ops.release_bootmem = mpc512x_release_bootmem;
} }
#else
void __init mpc512x_setup_diu(void) { /* EMPTY */ }
void __init mpc512x_init_diu(void) { /* EMPTY */ }
#endif
void __init mpc512x_init_IRQ(void) void __init mpc512x_init_IRQ(void)
{ {
struct device_node *np; struct device_node *np;
...@@ -340,7 +333,7 @@ static struct of_device_id __initdata of_bus_ids[] = { ...@@ -340,7 +333,7 @@ static struct of_device_id __initdata of_bus_ids[] = {
{}, {},
}; };
void __init mpc512x_declare_of_platform_devices(void) static void __init mpc512x_declare_of_platform_devices(void)
{ {
if (of_platform_bus_probe(NULL, of_bus_ids, NULL)) if (of_platform_bus_probe(NULL, of_bus_ids, NULL))
printk(KERN_ERR __FILE__ ": " printk(KERN_ERR __FILE__ ": "
...@@ -390,7 +383,7 @@ static unsigned int __init get_fifo_size(struct device_node *np, ...@@ -390,7 +383,7 @@ static unsigned int __init get_fifo_size(struct device_node *np,
((u32)(_base) + sizeof(struct mpc52xx_psc))) ((u32)(_base) + sizeof(struct mpc52xx_psc)))
/* Init PSC FIFO space for TX and RX slices */ /* Init PSC FIFO space for TX and RX slices */
void __init mpc512x_psc_fifo_init(void) static void __init mpc512x_psc_fifo_init(void)
{ {
struct device_node *np; struct device_node *np;
void __iomem *psc; void __iomem *psc;
......
...@@ -21,8 +21,6 @@ struct device_node; ...@@ -21,8 +21,6 @@ struct device_node;
extern void fsl_rstcr_restart(char *cmd); extern void fsl_rstcr_restart(char *cmd);
#if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
/* The different ports that the DIU can be connected to */ /* The different ports that the DIU can be connected to */
enum fsl_diu_monitor_port { enum fsl_diu_monitor_port {
FSL_DIU_PORT_DVI, /* DVI */ FSL_DIU_PORT_DVI, /* DVI */
...@@ -43,7 +41,6 @@ struct platform_diu_data_ops { ...@@ -43,7 +41,6 @@ struct platform_diu_data_ops {
}; };
extern struct platform_diu_data_ops diu_ops; extern struct platform_diu_data_ops diu_ops;
#endif
void fsl_hv_restart(char *cmd); void fsl_hv_restart(char *cmd);
void fsl_hv_halt(void); void fsl_hv_halt(void);
......
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