diff options
| author | Robert Reif <reif@earthlink.net> | 2008-05-04 05:55:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-04 05:55:27 +0200 |
| commit | 5b81d689e57a85b1ff60edfb65e5b8a12d28ecee (patch) | |
| tree | c4bc8b6be5458d41090f2d5450374ea2abaa4443 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt (diff) | |
| download | linux-5b81d689e57a85b1ff60edfb65e5b8a12d28ecee.tar.xz linux-5b81d689e57a85b1ff60edfb65e5b8a12d28ecee.zip | |
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>
| -rw-r--r-- | drivers/video/tcx.c | 20 |
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 { struct tcx_thc { u32 thc_rev; - u32 thc_pad0[511]; + u32 thc_pad0[511]; u32 thc_hs; /* hsync timing */ u32 thc_hsdvs; u32 thc_hd; @@ -126,10 +126,10 @@ struct tcx_par { }; /* Reset control plane so that WID is 8-bit plane. */ -static void __tcx_set_control_plane (struct tcx_par *par) +static void __tcx_set_control_plane(struct tcx_par *par) { u32 __iomem *p, *pend; - + if (par->lowdepth) return; @@ -143,8 +143,8 @@ static void __tcx_set_control_plane (struct tcx_par *par) sbus_writel(tmp, p); } } - -static void tcx_reset (struct fb_info *info) + +static void tcx_reset(struct fb_info *info) { struct tcx_par *par = (struct tcx_par *) info->par; unsigned long flags; @@ -365,7 +365,8 @@ static void tcx_unmap_regs(struct of_device *op, struct fb_info *info, info->screen_base, par->fbsize); } -static int __devinit tcx_init_one(struct of_device *op) +static int __devinit tcx_probe(struct of_device *op, + const struct of_device_id *match) { struct device_node *dp = op->node; struct fb_info *info; @@ -488,13 +489,6 @@ out_err: return err; } -static int __devinit tcx_probe(struct of_device *dev, const struct of_device_id *match) -{ - struct of_device *op = to_of_device(&dev->dev); - - return tcx_init_one(op); -} - static int __devexit tcx_remove(struct of_device *op) { struct fb_info *info = dev_get_drvdata(&op->dev); |