git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
KVM: ia64: enable external interrupt in vmm
[safe/jmp/linux-2.6]
/
drivers
/
video
/
vt8623fb.c
diff --git
a/drivers/video/vt8623fb.c
b/drivers/video/vt8623fb.c
index
0b9dd22
..
3df17dc
100644
(file)
--- a/
drivers/video/vt8623fb.c
+++ b/
drivers/video/vt8623fb.c
@@
-12,7
+12,6
@@
* (http://davesdomain.org.uk/viafb/)
*/
* (http://davesdomain.org.uk/viafb/)
*/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/errno.h>
@@
-661,7
+660,7
@@
static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
}
/* Allocate and fill driver data structure */
}
/* Allocate and fill driver data structure */
- info = framebuffer_alloc(sizeof(struct vt8623fb_info),
NULL
);
+ info = framebuffer_alloc(sizeof(struct vt8623fb_info),
&(dev->dev)
);
if (! info) {
dev_err(&(dev->dev), "cannot allocate memory\n");
return -ENOMEM;
if (! info) {
dev_err(&(dev->dev), "cannot allocate memory\n");
return -ENOMEM;
@@
-677,13
+676,13
@@
static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
rc = pci_enable_device(dev);
if (rc < 0) {
rc = pci_enable_device(dev);
if (rc < 0) {
- dev_err(
&(dev->dev)
, "cannot enable PCI device\n");
+ dev_err(
info->device
, "cannot enable PCI device\n");
goto err_enable_device;
}
rc = pci_request_regions(dev, "vt8623fb");
if (rc < 0) {
goto err_enable_device;
}
rc = pci_request_regions(dev, "vt8623fb");
if (rc < 0) {
- dev_err(
&(dev->dev)
, "cannot reserve framebuffer region\n");
+ dev_err(
info->device
, "cannot reserve framebuffer region\n");
goto err_request_regions;
}
goto err_request_regions;
}
@@
-696,14
+695,14
@@
static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
info->screen_base = pci_iomap(dev, 0, 0);
if (! info->screen_base) {
rc = -ENOMEM;
info->screen_base = pci_iomap(dev, 0, 0);
if (! info->screen_base) {
rc = -ENOMEM;
- dev_err(
&(dev->dev)
, "iomap for framebuffer failed\n");
+ dev_err(
info->device
, "iomap for framebuffer failed\n");
goto err_iomap_1;
}
par->mmio_base = pci_iomap(dev, 1, 0);
if (! par->mmio_base) {
rc = -ENOMEM;
goto err_iomap_1;
}
par->mmio_base = pci_iomap(dev, 1, 0);
if (! par->mmio_base) {
rc = -ENOMEM;
- dev_err(
&(dev->dev)
, "iomap for MMIO failed\n");
+ dev_err(
info->device
, "iomap for MMIO failed\n");
goto err_iomap_2;
}
goto err_iomap_2;
}
@@
-714,7
+713,7
@@
static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
if ((16 <= memsize1) && (memsize1 <= 64) && (memsize1 == memsize2))
info->screen_size = memsize1 << 20;
else {
if ((16 <= memsize1) && (memsize1 <= 64) && (memsize1 == memsize2))
info->screen_size = memsize1 << 20;
else {
- dev_err(
&(dev->dev)
, "memory size detection failed (%x %x), suppose 16 MB\n", memsize1, memsize2);
+ dev_err(
info->device
, "memory size detection failed (%x %x), suppose 16 MB\n", memsize1, memsize2);
info->screen_size = 16 << 20;
}
info->screen_size = 16 << 20;
}
@@
-731,19
+730,19
@@
static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);
if (! ((rc == 1) || (rc == 2))) {
rc = -EINVAL;
rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);
if (! ((rc == 1) || (rc == 2))) {
rc = -EINVAL;
- dev_err(
&(dev->dev)
, "mode %s not found\n", mode_option);
+ dev_err(
info->device
, "mode %s not found\n", mode_option);
goto err_find_mode;
}
rc = fb_alloc_cmap(&info->cmap, 256, 0);
if (rc < 0) {
goto err_find_mode;
}
rc = fb_alloc_cmap(&info->cmap, 256, 0);
if (rc < 0) {
- dev_err(
&(dev->dev)
, "cannot allocate colormap\n");
+ dev_err(
info->device
, "cannot allocate colormap\n");
goto err_alloc_cmap;
}
rc = register_framebuffer(info);
if (rc < 0) {
goto err_alloc_cmap;
}
rc = register_framebuffer(info);
if (rc < 0) {
- dev_err(
&(dev->dev)
, "cannot register framebugger\n");
+ dev_err(
info->device
, "cannot register framebugger\n");
goto err_reg_fb;
}
goto err_reg_fb;
}
@@
-817,7
+816,7
@@
static int vt8623_pci_suspend(struct pci_dev* dev, pm_message_t state)
struct fb_info *info = pci_get_drvdata(dev);
struct vt8623fb_info *par = info->par;
struct fb_info *info = pci_get_drvdata(dev);
struct vt8623fb_info *par = info->par;
- dev_info(
&(dev->dev)
, "suspend\n");
+ dev_info(
info->device
, "suspend\n");
acquire_console_sem();
mutex_lock(&(par->open_lock));
acquire_console_sem();
mutex_lock(&(par->open_lock));
@@
-848,16
+847,13
@@
static int vt8623_pci_resume(struct pci_dev* dev)
struct fb_info *info = pci_get_drvdata(dev);
struct vt8623fb_info *par = info->par;
struct fb_info *info = pci_get_drvdata(dev);
struct vt8623fb_info *par = info->par;
- dev_info(
&(dev->dev)
, "resume\n");
+ dev_info(
info->device
, "resume\n");
acquire_console_sem();
mutex_lock(&(par->open_lock));
acquire_console_sem();
mutex_lock(&(par->open_lock));
- if (par->ref_count == 0) {
- mutex_unlock(&(par->open_lock));
- release_console_sem();
- return 0;
- }
+ if (par->ref_count == 0)
+ goto fail;
pci_set_power_state(dev, PCI_D0);
pci_restore_state(dev);
pci_set_power_state(dev, PCI_D0);
pci_restore_state(dev);
@@
-870,8
+866,8
@@
static int vt8623_pci_resume(struct pci_dev* dev)
vt8623fb_set_par(info);
fb_set_suspend(info, 0);
vt8623fb_set_par(info);
fb_set_suspend(info, 0);
- mutex_unlock(&(par->open_lock));
fail:
fail:
+ mutex_unlock(&(par->open_lock));
release_console_sem();
return 0;
release_console_sem();
return 0;