VIDEO: cyberpro: update handling of device structures

Provide the framebuffer device with its correct parent (the PCI
device for PCI connected cards.)  Also, use this struct device to
pass to sub-drivers rather than the pci_dev structure, which is
really what they want.  Also propagate the assigned IRQ, which
they were getting direct from the PCI device structure.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/video/cyber2000fb.h b/drivers/video/cyber2000fb.h
index 814cce5acf12..555c8d4f2b76 100644
--- a/drivers/video/cyber2000fb.h
+++ b/drivers/video/cyber2000fb.h
@@ -464,13 +464,14 @@ static void debug_printf(char *fmt, ...)
 struct cfb_info;
 
 struct cyberpro_info {
-        struct pci_dev  *dev;
+        struct device   *dev;
         struct i2c_adapter *i2c;
         unsigned char   __iomem *regs;
         char            __iomem *fb;
         char            dev_name[32];
         unsigned int    fb_size;
         unsigned int    chip_id;
+        unsigned int    irq;
 
         /*
          * The following is a pointer to be passed into the