projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[powerpc.git]
/
drivers
/
video
/
s1d13xxxfb.c
diff --git
a/drivers/video/s1d13xxxfb.c
b/drivers/video/s1d13xxxfb.c
index
f443743
..
e5d0f92
100644
(file)
--- a/
drivers/video/s1d13xxxfb.c
+++ b/
drivers/video/s1d13xxxfb.c
@@
-388,7
+388,6
@@
static struct fb_ops s1d13xxxfb_fbops = {
.fb_fillrect = cfb_fillrect,
.fb_copyarea = cfb_copyarea,
.fb_imageblit = cfb_imageblit,
.fb_fillrect = cfb_fillrect,
.fb_copyarea = cfb_copyarea,
.fb_imageblit = cfb_imageblit,
- .fb_cursor = soft_cursor
};
static int s1d13xxxfb_width_tab[2][4] __devinitdata = {
};
static int s1d13xxxfb_width_tab[2][4] __devinitdata = {
@@
-504,10
+503,9
@@
s1d13xxxfb_fetch_hw_state(struct fb_info *info)
static int
static int
-s1d13xxxfb_remove(struct
device *
dev)
+s1d13xxxfb_remove(struct
platform_device *p
dev)
{
{
- struct fb_info *info = dev_get_drvdata(dev);
- struct platform_device *pdev = to_platform_device(dev);
+ struct fb_info *info = platform_get_drvdata(pdev);
struct s1d13xxxfb_par *par = NULL;
if (info) {
struct s1d13xxxfb_par *par = NULL;
if (info) {
@@
-535,9
+533,8
@@
s1d13xxxfb_remove(struct device *dev)
}
static int __devinit
}
static int __devinit
-s1d13xxxfb_probe(struct
device *
dev)
+s1d13xxxfb_probe(struct
platform_device *p
dev)
{
{
- struct platform_device *pdev = to_platform_device(dev);
struct s1d13xxxfb_par *default_par;
struct fb_info *info;
struct s1d13xxxfb_pdata *pdata = NULL;
struct s1d13xxxfb_par *default_par;
struct fb_info *info;
struct s1d13xxxfb_pdata *pdata = NULL;
@@
-549,8
+546,8
@@
s1d13xxxfb_probe(struct device *dev)
printk(KERN_INFO "Epson S1D13XXX FB Driver\n");
/* enable platform-dependent hardware glue, if any */
printk(KERN_INFO "Epson S1D13XXX FB Driver\n");
/* enable platform-dependent hardware glue, if any */
- if (
dev->
platform_data)
- pdata =
dev->
platform_data;
+ if (
pdev->dev.
platform_data)
+ pdata =
pdev->dev.
platform_data;
if (pdata && pdata->platform_init_video)
pdata->platform_init_video();
if (pdata && pdata->platform_init_video)
pdata->platform_init_video();
@@
-573,14
+570,14
@@
s1d13xxxfb_probe(struct device *dev)
if (!request_mem_region(pdev->resource[0].start,
pdev->resource[0].end - pdev->resource[0].start +1, "s1d13xxxfb mem")) {
if (!request_mem_region(pdev->resource[0].start,
pdev->resource[0].end - pdev->resource[0].start +1, "s1d13xxxfb mem")) {
- dev_dbg(dev, "request_mem_region failed\n");
+ dev_dbg(
&pdev->
dev, "request_mem_region failed\n");
ret = -EBUSY;
goto bail;
}
if (!request_mem_region(pdev->resource[1].start,
pdev->resource[1].end - pdev->resource[1].start +1, "s1d13xxxfb regs")) {
ret = -EBUSY;
goto bail;
}
if (!request_mem_region(pdev->resource[1].start,
pdev->resource[1].end - pdev->resource[1].start +1, "s1d13xxxfb regs")) {
- dev_dbg(dev, "request_mem_region failed\n");
+ dev_dbg(
&pdev->
dev, "request_mem_region failed\n");
ret = -EBUSY;
goto bail;
}
ret = -EBUSY;
goto bail;
}
@@
-641,7
+638,7
@@
s1d13xxxfb_probe(struct device *dev)
goto bail;
}
goto bail;
}
-
dev_set_drvdata(&pdev->
dev, info);
+
platform_set_drvdata(p
dev, info);
printk(KERN_INFO "fb%d: %s frame buffer device\n",
info->node, info->fix.id);
printk(KERN_INFO "fb%d: %s frame buffer device\n",
info->node, info->fix.id);
@@
-649,15
+646,15
@@
s1d13xxxfb_probe(struct device *dev)
return 0;
bail:
return 0;
bail:
- s1d13xxxfb_remove(dev);
+ s1d13xxxfb_remove(
p
dev);
return ret;
}
#ifdef CONFIG_PM
return ret;
}
#ifdef CONFIG_PM
-static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state)
+static int s1d13xxxfb_suspend(struct
platform_
device *dev, pm_message_t state)
{
{
- struct fb_info *info =
dev
_get_drvdata(dev);
+ struct fb_info *info =
platform
_get_drvdata(dev);
struct s1d13xxxfb_par *s1dfb = info->par;
struct s1d13xxxfb_pdata *pdata = NULL;
struct s1d13xxxfb_par *s1dfb = info->par;
struct s1d13xxxfb_pdata *pdata = NULL;
@@
-665,8
+662,8
@@
static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state)
lcd_enable(s1dfb, 0);
crt_enable(s1dfb, 0);
lcd_enable(s1dfb, 0);
crt_enable(s1dfb, 0);
- if (dev->platform_data)
- pdata = dev->platform_data;
+ if (dev->
dev.
platform_data)
+ pdata = dev->
dev.
platform_data;
#if 0
if (!s1dfb->disp_save)
#if 0
if (!s1dfb->disp_save)
@@
-702,9
+699,9
@@
static int s1d13xxxfb_suspend(struct device *dev, pm_message_t state)
return 0;
}
return 0;
}
-static int s1d13xxxfb_resume(struct device *dev)
+static int s1d13xxxfb_resume(struct
platform_
device *dev)
{
{
- struct fb_info *info =
dev
_get_drvdata(dev);
+ struct fb_info *info =
platform
_get_drvdata(dev);
struct s1d13xxxfb_par *s1dfb = info->par;
struct s1d13xxxfb_pdata *pdata = NULL;
struct s1d13xxxfb_par *s1dfb = info->par;
struct s1d13xxxfb_pdata *pdata = NULL;
@@
-715,8
+712,8
@@
static int s1d13xxxfb_resume(struct device *dev)
while ((s1d13xxxfb_readreg(s1dfb, S1DREG_PS_STATUS) & 0x01))
udelay(10);
while ((s1d13xxxfb_readreg(s1dfb, S1DREG_PS_STATUS) & 0x01))
udelay(10);
- if (dev->platform_data)
- pdata = dev->platform_data;
+ if (dev->
dev.
platform_data)
+ pdata = dev->
dev.
platform_data;
if (s1dfb->regs_save) {
/* will write RO regs, *should* get away with it :) */
if (s1dfb->regs_save) {
/* will write RO regs, *should* get away with it :) */
@@
-742,15
+739,16
@@
static int s1d13xxxfb_resume(struct device *dev)
}
#endif /* CONFIG_PM */
}
#endif /* CONFIG_PM */
-static struct device_driver s1d13xxxfb_driver = {
- .name = S1D_DEVICENAME,
- .bus = &platform_bus_type,
+static struct platform_driver s1d13xxxfb_driver = {
.probe = s1d13xxxfb_probe,
.remove = s1d13xxxfb_remove,
#ifdef CONFIG_PM
.suspend = s1d13xxxfb_suspend,
.probe = s1d13xxxfb_probe,
.remove = s1d13xxxfb_remove,
#ifdef CONFIG_PM
.suspend = s1d13xxxfb_suspend,
- .resume = s1d13xxxfb_resume
+ .resume = s1d13xxxfb_resume
,
#endif
#endif
+ .driver = {
+ .name = S1D_DEVICENAME,
+ },
};
};
@@
-760,14
+758,14
@@
s1d13xxxfb_init(void)
if (fb_get_options("s1d13xxxfb", NULL))
return -ENODEV;
if (fb_get_options("s1d13xxxfb", NULL))
return -ENODEV;
- return driver_register(&s1d13xxxfb_driver);
+ return
platform_
driver_register(&s1d13xxxfb_driver);
}
static void __exit
s1d13xxxfb_exit(void)
{
}
static void __exit
s1d13xxxfb_exit(void)
{
- driver_unregister(&s1d13xxxfb_driver);
+
platform_
driver_unregister(&s1d13xxxfb_driver);
}
module_init(s1d13xxxfb_init);
}
module_init(s1d13xxxfb_init);