aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/aty/radeon_monitor.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-21 16:07:39 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-03 18:57:01 -0500
commit48c68c4f1b542444f175a9e136febcecf3e704d8 (patch)
treed28f4f3b42643990c2908d27e9caf120f6234b73 /drivers/video/aty/radeon_monitor.c
parent8590dbc79a0ff5d7ab16b2b1743684c241ae3c65 (diff)
Drivers: video: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev* markings need to be removed. This change removes the use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit from these drivers. Based on patches originally written by Bill Pemberton, but redone by me in order to handle some of the coding style issues better, by hand. Cc: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/aty/radeon_monitor.c')
-rw-r--r--drivers/video/aty/radeon_monitor.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c
index 5c23eac0eb9a..bc078d50d8f1 100644
--- a/drivers/video/aty/radeon_monitor.c
+++ b/drivers/video/aty/radeon_monitor.c
@@ -62,8 +62,8 @@ static char *radeon_get_mon_name(int type)
62 * models with broken OF probing by hard-coding known EDIDs for some Mac 62 * models with broken OF probing by hard-coding known EDIDs for some Mac
63 * laptops internal LVDS panel. (XXX: not done yet) 63 * laptops internal LVDS panel. (XXX: not done yet)
64 */ 64 */
65static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_EDID, 65static int radeon_parse_montype_prop(struct device_node *dp, u8 **out_EDID,
66 int hdno) 66 int hdno)
67{ 67{
68 static char *propnames[] = { "DFP,EDID", "LCD,EDID", "EDID", 68 static char *propnames[] = { "DFP,EDID", "LCD,EDID", "EDID",
69 "EDID1", "EDID2", NULL }; 69 "EDID1", "EDID2", NULL };
@@ -115,8 +115,8 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
115 return mt; 115 return mt;
116} 116}
117 117
118static int __devinit radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_no, 118static int radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_no,
119 u8 **out_EDID) 119 u8 **out_EDID)
120{ 120{
121 struct device_node *dp; 121 struct device_node *dp;
122 122
@@ -163,7 +163,7 @@ static int __devinit radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_
163#endif /* CONFIG_PPC_OF || CONFIG_SPARC */ 163#endif /* CONFIG_PPC_OF || CONFIG_SPARC */
164 164
165 165
166static int __devinit radeon_get_panel_info_BIOS(struct radeonfb_info *rinfo) 166static int radeon_get_panel_info_BIOS(struct radeonfb_info *rinfo)
167{ 167{
168 unsigned long tmp, tmp0; 168 unsigned long tmp, tmp0;
169 char stmp[30]; 169 char stmp[30];
@@ -251,7 +251,7 @@ static int __devinit radeon_get_panel_info_BIOS(struct radeonfb_info *rinfo)
251 * doesn't quite work yet, but it's output is still useful for 251 * doesn't quite work yet, but it's output is still useful for
252 * debugging 252 * debugging
253 */ 253 */
254static void __devinit radeon_parse_connector_info(struct radeonfb_info *rinfo) 254static void radeon_parse_connector_info(struct radeonfb_info *rinfo)
255{ 255{
256 int offset, chips, connectors, tmp, i, conn, type; 256 int offset, chips, connectors, tmp, i, conn, type;
257 257
@@ -297,7 +297,7 @@ static void __devinit radeon_parse_connector_info(struct radeonfb_info *rinfo)
297 * as well and currently is only implemented for the CRT DAC, the 297 * as well and currently is only implemented for the CRT DAC, the
298 * code for the TVDAC is commented out in XFree as "non working" 298 * code for the TVDAC is commented out in XFree as "non working"
299 */ 299 */
300static int __devinit radeon_crt_is_connected(struct radeonfb_info *rinfo, int is_crt_dac) 300static int radeon_crt_is_connected(struct radeonfb_info *rinfo, int is_crt_dac)
301{ 301{
302 int connected = 0; 302 int connected = 0;
303 303
@@ -369,8 +369,8 @@ static int __devinit radeon_crt_is_connected(struct radeonfb_info *rinfo, int is
369 * Parse the "monitor_layout" string if any. This code is mostly 369 * Parse the "monitor_layout" string if any. This code is mostly
370 * copied from XFree's radeon driver 370 * copied from XFree's radeon driver
371 */ 371 */
372static int __devinit radeon_parse_monitor_layout(struct radeonfb_info *rinfo, 372static int radeon_parse_monitor_layout(struct radeonfb_info *rinfo,
373 const char *monitor_layout) 373 const char *monitor_layout)
374{ 374{
375 char s1[5], s2[5]; 375 char s1[5], s2[5];
376 int i = 0, second = 0; 376 int i = 0, second = 0;
@@ -433,8 +433,8 @@ static int __devinit radeon_parse_monitor_layout(struct radeonfb_info *rinfo,
433 * try to retrieve EDID. The algorithm here comes from XFree's radeon 433 * try to retrieve EDID. The algorithm here comes from XFree's radeon
434 * driver 434 * driver
435 */ 435 */
436void __devinit radeon_probe_screens(struct radeonfb_info *rinfo, 436void radeon_probe_screens(struct radeonfb_info *rinfo,
437 const char *monitor_layout, int ignore_edid) 437 const char *monitor_layout, int ignore_edid)
438{ 438{
439#ifdef CONFIG_FB_RADEON_I2C 439#ifdef CONFIG_FB_RADEON_I2C
440 int ddc_crt2_used = 0; 440 int ddc_crt2_used = 0;
@@ -753,7 +753,7 @@ static int is_powerblade(const char *model)
753 * Build the modedb for head 1 (head 2 will come later), check panel infos 753 * Build the modedb for head 1 (head 2 will come later), check panel infos
754 * from either BIOS or EDID, and pick up the default mode 754 * from either BIOS or EDID, and pick up the default mode
755 */ 755 */
756void __devinit radeon_check_modes(struct radeonfb_info *rinfo, const char *mode_option) 756void radeon_check_modes(struct radeonfb_info *rinfo, const char *mode_option)
757{ 757{
758 struct fb_info * info = rinfo->info; 758 struct fb_info * info = rinfo->info;
759 int has_default_mode = 0; 759 int has_default_mode = 0;