staging: xgifb: delete "off" option handling

It's possible to disable the built-in xgifb driver with the kernel
command line option:

	video=xgifb:off

This is already handled by the generic framebuffer layer (fb_get_options()
will return TRUE resulting in init failure), so no need to process the
option in the driver.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
index 08f62e1e2748cea9b25743fa115f9f5538251b96..b65ed6e6b819896fdb63d3b082d68bce104e92a3 100644 (file)
--- a/drivers/staging/xgifb/XGI_main.h
+++ b/drivers/staging/xgifb/XGI_main.h
@@ -167,7 +167,6 @@ static u32 pseudo_palette[17];
 
 
 /* display status */
-static int XGIfb_off;
 static int XGIfb_crt1off;
 static int XGIfb_forcecrt1 = -1;
 static int XGIfb_userom ;

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index ceb0883ebf05cbeaff0b94b9ba73999112a07f4a..442774508d2a07c3d205e113b6b5c2442f5ce131 100644 (file)
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -1960,8 +1960,6 @@ static int __init XGIfb_setup(char *options)
                } else if (!strncmp(this_opt, "rate:", 5)) {
                        xgi_video_info.refresh_rate = simple_strtoul(
                                                this_opt + 5, NULL, 0);
-               } else if (!strncmp(this_opt, "off", 3)) {
-                       XGIfb_off = 1;
                } else if (!strncmp(this_opt, "crt1off", 7)) {
                        XGIfb_crt1off = 1;
                } else if (!strncmp(this_opt, "filter:", 7)) {
@@ -2023,9 +2021,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
        u8 CR48, CR38;
        int ret;
 
-       if (XGIfb_off)
-               return -ENXIO;
-
        memset(&XGIhw_ext, 0, sizeof(struct xgi_hw_device_info));
        fb_info = framebuffer_alloc(sizeof(struct fb_info), &pdev->dev);
        if (!fb_info)