Merge git://git.infradead.org/mtd-2.6

[linux-2.6] / drivers / video / backlight / progear_bl.c

diff --git a/drivers/video/backlight/progear_bl.c b/drivers/video/backlight/progear_bl.c
index 42d6acd96c1a0fbee9c5a4501082e9e031d2bb66..15fb4d58b5bcce35f4e8c0a9a00bd0d76246370e 100644 (file)
--- a/drivers/video/backlight/progear_bl.c
+++ b/drivers/video/backlight/progear_bl.c
@@ -23,7 +23,6 @@
 #include <linux/fb.h>
 #include <linux/backlight.h>
 #include <linux/pci.h>
-#include <asm/uaccess.h>
 
 #define PMU_LPCR               0xB0
 #define SB_MPS1                0x61
@@ -35,11 +34,11 @@ static struct pci_dev *sb_dev = NULL;
 
 static int progearbl_set_intensity(struct backlight_device *bd)
 {
-       int intensity = bd->props->brightness;
+       int intensity = bd->props.brightness;
 
-       if (bd->props->power != FB_BLANK_UNBLANK)
+       if (bd->props.power != FB_BLANK_UNBLANK)
                intensity = 0;
-       if (bd->props->fb_blank != FB_BLANK_UNBLANK)
+       if (bd->props.fb_blank != FB_BLANK_UNBLANK)
                intensity = 0;
 
        pci_write_config_byte(pmu_dev, PMU_LPCR, intensity + HW_LEVEL_MIN);
@@ -55,7 +54,7 @@ static int progearbl_get_intensity(struct backlight_device *bd)
        return intensity - HW_LEVEL_MIN;
 }
 
-static struct backlight_properties progearbl_data = {
+static struct backlight_ops progearbl_ops = {
        .get_brightness = progearbl_get_intensity,
        .update_status = progearbl_set_intensity,
 };
@@ -65,13 +64,13 @@ static int progearbl_probe(struct platform_device *pdev)
        u8 temp;
        struct backlight_device *progear_backlight_device;
 
-       pmu_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, 0);
+       pmu_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, NULL);
        if (!pmu_dev) {
                printk("ALI M7101 PMU not found.\n");
                return -ENODEV;
        }
 
-       sb_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, 0);
+       sb_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
        if (!sb_dev) {
                printk("ALI 1533 SB not found.\n");
                pci_dev_put(pmu_dev);
@@ -84,15 +83,15 @@ static int progearbl_probe(struct platform_device *pdev)
 
        progear_backlight_device = backlight_device_register("progear-bl",
                                                             &pdev->dev, NULL,
-                                                            &progearbl_data);
+                                                            &progearbl_ops);
        if (IS_ERR(progear_backlight_device))
                return PTR_ERR(progear_backlight_device);
 
        platform_set_drvdata(pdev, progear_backlight_device);
 
-       progearbl_data.power = FB_BLANK_UNBLANK;
-       progearbl_data.brightness = HW_LEVEL_MAX - HW_LEVEL_MIN;
-       progearbl_data.max_brightness = HW_LEVEL_MAX - HW_LEVEL_MIN;
+       progear_backlight_device->props.power = FB_BLANK_UNBLANK;
+       progear_backlight_device->props.brightness = HW_LEVEL_MAX - HW_LEVEL_MIN;
+       progear_backlight_device->props.max_brightness = HW_LEVEL_MAX - HW_LEVEL_MIN;
        progearbl_set_intensity(progear_backlight_device);
 
        return 0;