Commit 4c7bf386 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds

skeletonfb: more corrections

More corrections to skeletonfb.c file:
- fixed types of more arguments
- removed returned values in void functions
- removed not existing fb_poll function
- fixed closing comment typo
- corrected misleading constant name ADDR
Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Acked-By: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7e645ffd
...@@ -148,7 +148,7 @@ int xxxfb_setup(char*); ...@@ -148,7 +148,7 @@ int xxxfb_setup(char*);
* *
* Returns negative errno on error, or zero on success. * Returns negative errno on error, or zero on success.
*/ */
static int xxxfb_open(const struct fb_info *info, int user) static int xxxfb_open(struct fb_info *info, int user)
{ {
return 0; return 0;
} }
...@@ -167,7 +167,7 @@ static int xxxfb_open(const struct fb_info *info, int user) ...@@ -167,7 +167,7 @@ static int xxxfb_open(const struct fb_info *info, int user)
* *
* Returns negative errno on error, or zero on success. * Returns negative errno on error, or zero on success.
*/ */
static int xxxfb_release(const struct fb_info *info, int user) static int xxxfb_release(struct fb_info *info, int user)
{ {
return 0; return 0;
} }
...@@ -628,19 +628,6 @@ void xxxfb_rotate(struct fb_info *info, int angle) ...@@ -628,19 +628,6 @@ void xxxfb_rotate(struct fb_info *info, int angle)
/* Will be deprecated */ /* Will be deprecated */
} }
/**
* xxxfb_poll - NOT a required function. The purpose of this
* function is to provide a way for some process
* to wait until a specific hardware event occurs
* for the framebuffer device.
*
* @info: frame buffer structure that represents a single frame buffer
* @wait: poll table where we store process that await a event.
*/
void xxxfb_poll(struct fb_info *info, poll_table *wait)
{
}
/** /**
* xxxfb_sync - NOT a required function. Normally the accel engine * xxxfb_sync - NOT a required function. Normally the accel engine
* for a graphics card take a specific amount of time. * for a graphics card take a specific amount of time.
...@@ -678,7 +665,6 @@ static struct fb_ops xxxfb_ops = { ...@@ -678,7 +665,6 @@ static struct fb_ops xxxfb_ops = {
.fb_imageblit = xxxfb_imageblit, /* Needed !!! */ .fb_imageblit = xxxfb_imageblit, /* Needed !!! */
.fb_cursor = xxxfb_cursor, /* Optional !!! */ .fb_cursor = xxxfb_cursor, /* Optional !!! */
.fb_rotate = xxxfb_rotate, .fb_rotate = xxxfb_rotate,
.fb_poll = xxxfb_poll,
.fb_sync = xxxfb_sync, .fb_sync = xxxfb_sync,
.fb_ioctl = xxxfb_ioctl, .fb_ioctl = xxxfb_ioctl,
.fb_mmap = xxxfb_mmap, .fb_mmap = xxxfb_mmap,
...@@ -692,7 +678,7 @@ static struct fb_ops xxxfb_ops = { ...@@ -692,7 +678,7 @@ static struct fb_ops xxxfb_ops = {
/* static int __init xxfb_probe (struct device *device) -- for platform devs */ /* static int __init xxfb_probe (struct device *device) -- for platform devs */
static int __devinit xxxfb_probe(struct pci_dev *dev, static int __devinit xxxfb_probe(struct pci_dev *dev,
const_struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct fb_info *info; struct fb_info *info;
struct xxx_par *par; struct xxx_par *par;
...@@ -858,8 +844,6 @@ static void __devexit xxxfb_remove(struct pci_dev *dev) ...@@ -858,8 +844,6 @@ static void __devexit xxxfb_remove(struct pci_dev *dev)
/* ... */ /* ... */
framebuffer_release(info); framebuffer_release(info);
} }
return 0;
} }
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
...@@ -902,7 +886,7 @@ static int xxxfb_resume(struct pci_dev *dev) ...@@ -902,7 +886,7 @@ static int xxxfb_resume(struct pci_dev *dev)
static struct pci_device_id xxxfb_id_table[] = { static struct pci_device_id xxxfb_id_table[] = {
{ PCI_VENDOR_ID_XXX, PCI_DEVICE_ID_XXX, { PCI_VENDOR_ID_XXX, PCI_DEVICE_ID_XXX,
PCI_ANY_ID, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY << 16, PCI_ANY_ID, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY << 16,
ADDR, 0 }, PCI_CLASS_MASK, 0 },
{ 0, } { 0, }
}; };
...@@ -1033,7 +1017,7 @@ int __init xxxfb_setup(char *options) ...@@ -1033,7 +1017,7 @@ int __init xxxfb_setup(char *options)
{ {
/* Parse user speficied options (`video=xxxfb:') */ /* Parse user speficied options (`video=xxxfb:') */
} }
#endif /* MODULE *? #endif /* MODULE */
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment