aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorRobert Reif <reif@earthlink.net>2008-05-03 23:55:27 -0400
committerDavid S. Miller <davem@davemloft.net>2008-05-03 23:55:27 -0400
commit5b81d689e57a85b1ff60edfb65e5b8a12d28ecee (patch)
treec4bc8b6be5458d41090f2d5450374ea2abaa4443 /drivers/video
parentafa26be86b65a7183ceac29bdf1f51d6fc6932f0 (diff)
sparc: tcx.c remove unnecessary function
From: Robert Reif <reif@earthlink.net> Replaced tcx_init_one with tcx_probe. Fixed some checkpatch problems. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/tcx.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index a71774305772..44e8c27ed0fc 100644
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -84,7 +84,7 @@ struct tcx_tec {
84 84
85struct tcx_thc { 85struct tcx_thc {
86 u32 thc_rev; 86 u32 thc_rev;
87 u32 thc_pad0[511]; 87 u32 thc_pad0[511];
88 u32 thc_hs; /* hsync timing */ 88 u32 thc_hs; /* hsync timing */
89 u32 thc_hsdvs; 89 u32 thc_hsdvs;
90 u32 thc_hd; 90 u32 thc_hd;
@@ -126,10 +126,10 @@ struct tcx_par {
126}; 126};
127 127
128/* Reset control plane so that WID is 8-bit plane. */ 128/* Reset control plane so that WID is 8-bit plane. */
129static void __tcx_set_control_plane (struct tcx_par *par) 129static void __tcx_set_control_plane(struct tcx_par *par)
130{ 130{
131 u32 __iomem *p, *pend; 131 u32 __iomem *p, *pend;
132 132
133 if (par->lowdepth) 133 if (par->lowdepth)
134 return; 134 return;
135 135
@@ -143,8 +143,8 @@ static void __tcx_set_control_plane (struct tcx_par *par)
143 sbus_writel(tmp, p); 143 sbus_writel(tmp, p);
144 } 144 }
145} 145}
146 146
147static void tcx_reset (struct fb_info *info) 147static void tcx_reset(struct fb_info *info)
148{ 148{
149 struct tcx_par *par = (struct tcx_par *) info->par; 149 struct tcx_par *par = (struct tcx_par *) info->par;
150 unsigned long flags; 150 unsigned long flags;
@@ -365,7 +365,8 @@ static void tcx_unmap_regs(struct of_device *op, struct fb_info *info,
365 info->screen_base, par->fbsize); 365 info->screen_base, par->fbsize);
366} 366}
367 367
368static int __devinit tcx_init_one(struct of_device *op) 368static int __devinit tcx_probe(struct of_device *op,
369 const struct of_device_id *match)
369{ 370{
370 struct device_node *dp = op->node; 371 struct device_node *dp = op->node;
371 struct fb_info *info; 372 struct fb_info *info;
@@ -488,13 +489,6 @@ out_err:
488 return err; 489 return err;
489} 490}
490 491
491static int __devinit tcx_probe(struct of_device *dev, const struct of_device_id *match)
492{
493 struct of_device *op = to_of_device(&dev->dev);
494
495 return tcx_init_one(op);
496}
497
498static int __devexit tcx_remove(struct of_device *op) 492static int __devexit tcx_remove(struct of_device *op)
499{ 493{
500 struct fb_info *info = dev_get_drvdata(&op->dev); 494 struct fb_info *info = dev_get_drvdata(&op->dev);