lkml.org 
[lkml]   [2012]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/41] misc: pti, move ->remove to the PCI code
    Date
    The function is lost somewhere in the forest. Move it to have it along
    with probe and other pci_driver stuff.

    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Cc: J Freyensee <james_p_freyensee@linux.intel.com>
    ---
    drivers/misc/pti.c | 32 ++++++++++++++++----------------
    1 file changed, 16 insertions(+), 16 deletions(-)

    diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c
    index 3bfc8e3..4a24421 100644
    --- a/drivers/misc/pti.c
    +++ b/drivers/misc/pti.c
    @@ -393,22 +393,6 @@ void pti_writedata(struct pti_masterchannel *mc, u8 *buf, int count)
    }
    EXPORT_SYMBOL_GPL(pti_writedata);

    -/**
    - * pti_pci_remove()- Driver exit method to remove PTI from
    - * PCI bus.
    - * @pdev: variable containing pci info of PTI.
    - */
    -static void __devexit pti_pci_remove(struct pci_dev *pdev)
    -{
    - struct pti_dev *drv_data = pci_get_drvdata(pdev);
    -
    - iounmap(drv_data->pti_ioaddr);
    - pci_set_drvdata(pdev, NULL);
    - kfree(drv_data);
    - pci_release_region(pdev, 1);
    - pci_disable_device(pdev);
    -}
    -
    /*
    * for the tty_driver_*() basic function descriptions, see tty_driver.h.
    * Specific header comments made for PTI-related specifics.
    @@ -881,6 +865,22 @@ static int __devinit pti_pci_probe(struct pci_dev *pdev,
    return retval;
    }

    +/**
    + * pti_pci_remove()- Driver exit method to remove PTI from
    + * PCI bus.
    + * @pdev: variable containing pci info of PTI.
    + */
    +static void __devexit pti_pci_remove(struct pci_dev *pdev)
    +{
    + struct pti_dev *drv_data = pci_get_drvdata(pdev);
    +
    + iounmap(drv_data->pti_ioaddr);
    + pci_set_drvdata(pdev, NULL);
    + kfree(drv_data);
    + pci_release_region(pdev, 1);
    + pci_disable_device(pdev);
    +}
    +
    static struct pci_driver pti_pci_driver = {
    .name = PCINAME,
    .id_table = pci_ids,
    --
    1.7.10.4



    \
     
     \ /
      Last update: 2012-08-07 23:41    [W:4.328 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site