diff options
author | Ondrej Zajicek <santiago@crfreenet.org> | 2008-04-28 05:15:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:38 -0400 |
commit | 20e061fb750d36ec0ffcb2e44ed7dafa9018223b (patch) | |
tree | 2b3a55f91500ae0a1826a5ee9ac10f58e50b4049 /drivers/video/arkfb.c | |
parent | 8f5af9de9cf3cbf51c5758a1d5ea266aea6fe175 (diff) |
fbdev: framebuffer_alloc() fixes
Correct the dev arg of framebuffer_alloc() in arkfb, s3fb and vt8623fb.
Signed-off-by: Ondrej Zajicek <santiago@crfreenet.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/arkfb.c')
-rw-r--r-- | drivers/video/arkfb.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c index 0f6e0043069d..5001bd4ef466 100644 --- a/drivers/video/arkfb.c +++ b/drivers/video/arkfb.c | |||
@@ -943,7 +943,7 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_ | |||
943 | } | 943 | } |
944 | 944 | ||
945 | /* Allocate and fill driver data structure */ | 945 | /* Allocate and fill driver data structure */ |
946 | info = framebuffer_alloc(sizeof(struct arkfb_info), NULL); | 946 | info = framebuffer_alloc(sizeof(struct arkfb_info), &(dev->dev)); |
947 | if (! info) { | 947 | if (! info) { |
948 | dev_err(&(dev->dev), "cannot allocate memory\n"); | 948 | dev_err(&(dev->dev), "cannot allocate memory\n"); |
949 | return -ENOMEM; | 949 | return -ENOMEM; |
@@ -958,20 +958,20 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_ | |||
958 | /* Prepare PCI device */ | 958 | /* Prepare PCI device */ |
959 | rc = pci_enable_device(dev); | 959 | rc = pci_enable_device(dev); |
960 | if (rc < 0) { | 960 | if (rc < 0) { |
961 | dev_err(&(dev->dev), "cannot enable PCI device\n"); | 961 | dev_err(info->dev, "cannot enable PCI device\n"); |
962 | goto err_enable_device; | 962 | goto err_enable_device; |
963 | } | 963 | } |
964 | 964 | ||
965 | rc = pci_request_regions(dev, "arkfb"); | 965 | rc = pci_request_regions(dev, "arkfb"); |
966 | if (rc < 0) { | 966 | if (rc < 0) { |
967 | dev_err(&(dev->dev), "cannot reserve framebuffer region\n"); | 967 | dev_err(info->dev, "cannot reserve framebuffer region\n"); |
968 | goto err_request_regions; | 968 | goto err_request_regions; |
969 | } | 969 | } |
970 | 970 | ||
971 | par->dac = ics5342_init(ark_dac_read_regs, ark_dac_write_regs, info); | 971 | par->dac = ics5342_init(ark_dac_read_regs, ark_dac_write_regs, info); |
972 | if (! par->dac) { | 972 | if (! par->dac) { |
973 | rc = -ENOMEM; | 973 | rc = -ENOMEM; |
974 | dev_err(&(dev->dev), "RAMDAC initialization failed\n"); | 974 | dev_err(info->dev, "RAMDAC initialization failed\n"); |
975 | goto err_dac; | 975 | goto err_dac; |
976 | } | 976 | } |
977 | 977 | ||
@@ -982,7 +982,7 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_ | |||
982 | info->screen_base = pci_iomap(dev, 0, 0); | 982 | info->screen_base = pci_iomap(dev, 0, 0); |
983 | if (! info->screen_base) { | 983 | if (! info->screen_base) { |
984 | rc = -ENOMEM; | 984 | rc = -ENOMEM; |
985 | dev_err(&(dev->dev), "iomap for framebuffer failed\n"); | 985 | dev_err(info->dev, "iomap for framebuffer failed\n"); |
986 | goto err_iomap; | 986 | goto err_iomap; |
987 | } | 987 | } |
988 | 988 | ||
@@ -1004,19 +1004,19 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_ | |||
1004 | rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8); | 1004 | rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8); |
1005 | if (! ((rc == 1) || (rc == 2))) { | 1005 | if (! ((rc == 1) || (rc == 2))) { |
1006 | rc = -EINVAL; | 1006 | rc = -EINVAL; |
1007 | dev_err(&(dev->dev), "mode %s not found\n", mode_option); | 1007 | dev_err(info->dev, "mode %s not found\n", mode_option); |
1008 | goto err_find_mode; | 1008 | goto err_find_mode; |
1009 | } | 1009 | } |
1010 | 1010 | ||
1011 | rc = fb_alloc_cmap(&info->cmap, 256, 0); | 1011 | rc = fb_alloc_cmap(&info->cmap, 256, 0); |
1012 | if (rc < 0) { | 1012 | if (rc < 0) { |
1013 | dev_err(&(dev->dev), "cannot allocate colormap\n"); | 1013 | dev_err(info->dev, "cannot allocate colormap\n"); |
1014 | goto err_alloc_cmap; | 1014 | goto err_alloc_cmap; |
1015 | } | 1015 | } |
1016 | 1016 | ||
1017 | rc = register_framebuffer(info); | 1017 | rc = register_framebuffer(info); |
1018 | if (rc < 0) { | 1018 | if (rc < 0) { |
1019 | dev_err(&(dev->dev), "cannot register framebugger\n"); | 1019 | dev_err(info->dev, "cannot register framebugger\n"); |
1020 | goto err_reg_fb; | 1020 | goto err_reg_fb; |
1021 | } | 1021 | } |
1022 | 1022 | ||
@@ -1090,7 +1090,7 @@ static int ark_pci_suspend (struct pci_dev* dev, pm_message_t state) | |||
1090 | struct fb_info *info = pci_get_drvdata(dev); | 1090 | struct fb_info *info = pci_get_drvdata(dev); |
1091 | struct arkfb_info *par = info->par; | 1091 | struct arkfb_info *par = info->par; |
1092 | 1092 | ||
1093 | dev_info(&(dev->dev), "suspend\n"); | 1093 | dev_info(info->dev, "suspend\n"); |
1094 | 1094 | ||
1095 | acquire_console_sem(); | 1095 | acquire_console_sem(); |
1096 | mutex_lock(&(par->open_lock)); | 1096 | mutex_lock(&(par->open_lock)); |
@@ -1121,7 +1121,7 @@ static int ark_pci_resume (struct pci_dev* dev) | |||
1121 | struct fb_info *info = pci_get_drvdata(dev); | 1121 | struct fb_info *info = pci_get_drvdata(dev); |
1122 | struct arkfb_info *par = info->par; | 1122 | struct arkfb_info *par = info->par; |
1123 | 1123 | ||
1124 | dev_info(&(dev->dev), "resume\n"); | 1124 | dev_info(info->dev, "resume\n"); |
1125 | 1125 | ||
1126 | acquire_console_sem(); | 1126 | acquire_console_sem(); |
1127 | mutex_lock(&(par->open_lock)); | 1127 | mutex_lock(&(par->open_lock)); |