lkml.org 
[lkml]   [2005]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] [2.6] Clean up useless 8250 siig functions and header
    From
    Date
    This removes two simple siig functions that should just be integrated 
    into the
    calling code.

    [unhandled content-type:application/applefile]Index: drivers/parport/parport_serial.c
    ===================================================================
    RCS file: /home/kyle/bklinux/cvs/linux-2.5/drivers/parport/parport_serial.c,v
    retrieving revision 1.13
    diff -u -r1.13 parport_serial.c
    --- drivers/parport/parport_serial.c 24 Jun 2004 15:55:22 -0000 1.13
    +++ drivers/parport/parport_serial.c 5 Jan 2005 04:23:08 -0000
    @@ -26,7 +26,6 @@
    #include <linux/serial.h>
    #include <linux/serialP.h>
    #include <linux/list.h>
    -#include <linux/8250_pci.h>

    #include <asm/serial.h>

    @@ -159,12 +158,14 @@

    static int __devinit siig10x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable)
    {
    - return pci_siig10x_fn(dev, enable);
    + if (enable) return pci_siig10x_init(dev);
    + else return 0;
    }

    static int __devinit siig20x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable)
    {
    - return pci_siig20x_fn(dev, enable);
    + if (enable) return pci_siig20x_init(dev);
    + else return 0;
    }

    static struct pci_board_no_ids pci_boards[] __devinitdata = {
    Index: drivers/serial/8250_pci.c
    ===================================================================
    RCS file: /home/kyle/bklinux/cvs/linux-2.5/drivers/serial/8250_pci.c,v
    retrieving revision 1.39
    diff -u -r1.39 8250_pci.c
    --- drivers/serial/8250_pci.c 22 Nov 2004 16:43:12 -0000 1.39
    +++ drivers/serial/8250_pci.c 5 Jan 2005 04:26:58 -0000
    @@ -23,7 +23,6 @@
    #include <linux/delay.h>
    #include <linux/tty.h>
    #include <linux/serial_core.h>
    -#include <linux/8250_pci.h>
    #include <linux/bitops.h>

    #include <asm/byteorder.h>
    @@ -440,25 +439,6 @@
    return 0;
    }

    -int pci_siig10x_fn(struct pci_dev *dev, int enable)
    -{
    - int ret = 0;
    - if (enable)
    - ret = pci_siig10x_init(dev);
    - return ret;
    -}
    -
    -int pci_siig20x_fn(struct pci_dev *dev, int enable)
    -{
    - int ret = 0;
    - if (enable)
    - ret = pci_siig20x_init(dev);
    - return ret;
    -}
    -
    -EXPORT_SYMBOL(pci_siig10x_fn);
    -EXPORT_SYMBOL(pci_siig20x_fn);
    -
    /*
    * Timedia has an explosion of boards, and to avoid the PCI table from
    * growing *huge*, we use this function to collapse some 70 entries
    Index: include/linux/8250_pci.h
    ===================================================================
    RCS file: include/linux/8250_pci.h
    diff -N include/linux/8250_pci.h
    --- include/linux/8250_pci.h 21 Apr 2003 17:39:45 -0000 1.2
    +++ /dev/null 1 Jan 1970 00:00:00 -0000
    @@ -1,2 +0,0 @@
    -int pci_siig10x_fn(struct pci_dev *dev, int enable);
    -int pci_siig20x_fn(struct pci_dev *dev, int enable);

    Cheers,
    Kyle Moffett

    -----BEGIN GEEK CODE BLOCK-----
    Version: 3.12
    GCM/CS/IT/U d- s++: a18 C++++>$ UB/L/X/*++++(+)>$ P+++(++++)>$
    L++++(+++) E W++(+) N+++(++) o? K? w--- O? M++ V? PS+() PE+(-) Y+
    PGP+++ t+(+++) 5 X R? tv-(--) b++++(++) DI+ D+ G e->++++$ h!*()>++$ r
    !y?(-)
    ------END GEEK CODE BLOCK------

    \
     
     \ /
      Last update: 2005-03-22 14:09    [W:0.023 / U:1.188 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site