diff options
| author | Darren Etheridge <detheridge@ti.com> | 2013-08-05 18:02:38 -0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-08-09 07:02:43 -0400 |
| commit | a9cd67c8bc16f9729116e387057fdd915fc33bcb (patch) | |
| tree | f2d6b53deb483783ba7a323c8e8fbf23741501bb /drivers/video | |
| parent | 0715c72d03ea9297ce6fac5a46fc85618cd4a4ce (diff) | |
video: da8xx-fb: let compiler decide what to inline
Remove use of explicit inline compiler directive and let the compiler
make the decision as per Documentation/CodingStyle.
Signed-off-by: Darren Etheridge <detheridge@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/da8xx-fb.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c index 8c0ca11ad4b3..ea9771f98301 100644 --- a/drivers/video/da8xx-fb.c +++ b/drivers/video/da8xx-fb.c | |||
| @@ -141,12 +141,12 @@ static irq_handler_t lcdc_irq_handler; | |||
| 141 | static wait_queue_head_t frame_done_wq; | 141 | static wait_queue_head_t frame_done_wq; |
| 142 | static int frame_done_flag; | 142 | static int frame_done_flag; |
| 143 | 143 | ||
| 144 | static inline unsigned int lcdc_read(unsigned int addr) | 144 | static unsigned int lcdc_read(unsigned int addr) |
| 145 | { | 145 | { |
| 146 | return (unsigned int)__raw_readl(da8xx_fb_reg_base + (addr)); | 146 | return (unsigned int)__raw_readl(da8xx_fb_reg_base + (addr)); |
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | static inline void lcdc_write(unsigned int val, unsigned int addr) | 149 | static void lcdc_write(unsigned int val, unsigned int addr) |
| 150 | { | 150 | { |
| 151 | __raw_writel(val, da8xx_fb_reg_base + (addr)); | 151 | __raw_writel(val, da8xx_fb_reg_base + (addr)); |
| 152 | } | 152 | } |
| @@ -245,13 +245,13 @@ static struct fb_videomode known_lcd_panels[] = { | |||
| 245 | }, | 245 | }, |
| 246 | }; | 246 | }; |
| 247 | 247 | ||
| 248 | static inline bool da8xx_fb_is_raster_enabled(void) | 248 | static bool da8xx_fb_is_raster_enabled(void) |
| 249 | { | 249 | { |
| 250 | return !!(lcdc_read(LCD_RASTER_CTRL_REG) & LCD_RASTER_ENABLE); | 250 | return !!(lcdc_read(LCD_RASTER_CTRL_REG) & LCD_RASTER_ENABLE); |
| 251 | } | 251 | } |
| 252 | 252 | ||
| 253 | /* Enable the Raster Engine of the LCD Controller */ | 253 | /* Enable the Raster Engine of the LCD Controller */ |
| 254 | static inline void lcd_enable_raster(void) | 254 | static void lcd_enable_raster(void) |
| 255 | { | 255 | { |
| 256 | u32 reg; | 256 | u32 reg; |
| 257 | 257 | ||
| @@ -273,8 +273,7 @@ static inline void lcd_enable_raster(void) | |||
| 273 | } | 273 | } |
| 274 | 274 | ||
| 275 | /* Disable the Raster Engine of the LCD Controller */ | 275 | /* Disable the Raster Engine of the LCD Controller */ |
| 276 | static inline void lcd_disable_raster(enum da8xx_frame_complete | 276 | static void lcd_disable_raster(enum da8xx_frame_complete wait_for_frame_done) |
| 277 | wait_for_frame_done) | ||
| 278 | { | 277 | { |
| 279 | u32 reg; | 278 | u32 reg; |
| 280 | int ret; | 279 | int ret; |
| @@ -750,7 +749,7 @@ static int da8xx_fb_calc_config_clk_divider(struct da8xx_fb_par *par, | |||
| 750 | return da8xx_fb_config_clk_divider(par, lcdc_clk_div, lcdc_clk_rate); | 749 | return da8xx_fb_config_clk_divider(par, lcdc_clk_div, lcdc_clk_rate); |
| 751 | } | 750 | } |
| 752 | 751 | ||
| 753 | static inline unsigned da8xx_fb_round_clk(struct da8xx_fb_par *par, | 752 | static unsigned da8xx_fb_round_clk(struct da8xx_fb_par *par, |
| 754 | unsigned pixclock) | 753 | unsigned pixclock) |
| 755 | { | 754 | { |
| 756 | unsigned lcdc_clk_div, lcdc_clk_rate; | 755 | unsigned lcdc_clk_div, lcdc_clk_rate; |
| @@ -1043,7 +1042,7 @@ static int lcd_da8xx_cpufreq_transition(struct notifier_block *nb, | |||
| 1043 | return 0; | 1042 | return 0; |
| 1044 | } | 1043 | } |
| 1045 | 1044 | ||
| 1046 | static inline int lcd_da8xx_cpufreq_register(struct da8xx_fb_par *par) | 1045 | static int lcd_da8xx_cpufreq_register(struct da8xx_fb_par *par) |
| 1047 | { | 1046 | { |
| 1048 | par->freq_transition.notifier_call = lcd_da8xx_cpufreq_transition; | 1047 | par->freq_transition.notifier_call = lcd_da8xx_cpufreq_transition; |
| 1049 | 1048 | ||
| @@ -1051,7 +1050,7 @@ static inline int lcd_da8xx_cpufreq_register(struct da8xx_fb_par *par) | |||
| 1051 | CPUFREQ_TRANSITION_NOTIFIER); | 1050 | CPUFREQ_TRANSITION_NOTIFIER); |
| 1052 | } | 1051 | } |
| 1053 | 1052 | ||
| 1054 | static inline void lcd_da8xx_cpufreq_deregister(struct da8xx_fb_par *par) | 1053 | static void lcd_da8xx_cpufreq_deregister(struct da8xx_fb_par *par) |
| 1055 | { | 1054 | { |
| 1056 | cpufreq_unregister_notifier(&par->freq_transition, | 1055 | cpufreq_unregister_notifier(&par->freq_transition, |
| 1057 | CPUFREQ_TRANSITION_NOTIFIER); | 1056 | CPUFREQ_TRANSITION_NOTIFIER); |
