lkml.org 
[lkml]   [2011]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/22] staging: xgifb: delete unused LINUXBIOS code
    Date
    Delete unused LINUXBIOS code.

    Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
    ---
    drivers/staging/xgifb/XGI_main.h | 2 --
    drivers/staging/xgifb/XGI_main_26.c | 27 ---------------------------
    2 files changed, 0 insertions(+), 29 deletions(-)

    diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
    index b27623a..a014405 100644
    --- a/drivers/staging/xgifb/XGI_main.h
    +++ b/drivers/staging/xgifb/XGI_main.h
    @@ -9,8 +9,6 @@
    #include "vb_struct.h"
    #include "vb_def.h"

    -//#define LINUXBIOS /* turn this on when compiling for LINUXBIOS */
    -
    #define XGIFAIL(x) do { printk(x "\n"); return -EINVAL; } while(0)

    #define VER_MAJOR 0
    diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
    index ed0d554..79ff4df 100644
    --- a/drivers/staging/xgifb/XGI_main_26.c
    +++ b/drivers/staging/xgifb/XGI_main_26.c
    @@ -2265,34 +2265,10 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
    /* Mapping Max FB Size for 315 Init */
    XGIhw_ext.pjVideoMemoryAddress = ioremap(xgi_video_info.video_base, 0x10000000);
    if ((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF)) {
    -#ifdef LINUXBIOS
    - printk("XGIfb: XGIInit() ...");
    - /* XGIInitNewt for LINUXBIOS only */
    - if (XGIInitNew(&XGIhw_ext))
    - printk("OK\n");
    - else
    - printk("Fail\n");
    -#endif
    -
    outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);

    }
    }
    -#ifdef LINUXBIOS
    - else {
    - XGIhw_ext.pjVideoMemoryAddress = ioremap(xgi_video_info.video_base, 0x10000000);
    - if ((xgifb_mode_idx < 0) || ((XGIbios_mode[xgifb_mode_idx].mode_no) != 0xFF)) {
    -
    - outXGIIDXREG(XGISR, IND_XGI_PASSWORD, XGI_PASSWORD);
    -
    - /* yilin Because no VBIOS DRAM Sizing, Dram size will error. */
    - /* Set SR13 ,14 temporarily for UDtech */
    - outXGIIDXREG(XGISR, 0x13, 0x45);
    - outXGIIDXREG(XGISR, 0x14, 0x51);
    -
    - }
    - }
    -#endif
    if (XGIfb_get_dram_size()) {
    printk(KERN_INFO "XGIfb: Fatal error: Unable to determine RAM size.\n");
    ret = -ENODEV;
    @@ -2459,7 +2435,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
    XGIfb_detectedpdc = 0;

    XGIfb_detectedlcda = 0xff;
    -#ifndef LINUXBIOS

    /* TW: Try to find about LCDA */

    @@ -2492,8 +2467,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,

    }

    -#endif
    -
    if (xgifb_mode_idx >= 0)
    xgifb_mode_idx = XGIfb_validate_mode(xgifb_mode_idx);

    --
    1.5.6.5


    \
     
     \ /
      Last update: 2011-03-10 22:07    [W:0.025 / U:0.196 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site