Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325639
b: refs/heads/master
c: 065185f
h: refs/heads/master
i:
  325637: d06fc93
  325635: f2fa88e
  325631: 5c660b6
v: v3
  • Loading branch information
Jiri Slaby authored and Greg Kroah-Hartman committed Aug 10, 2012
1 parent 96e358f commit 3034866
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dda3f32c3a7201ee79e7e6a7b1d827b89759b4bc
refs/heads/master: 065185f604c604ce77c43d7f26faf712f0bfa265
32 changes: 16 additions & 16 deletions trunk/drivers/misc/pti.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 3034866

Please sign in to comment.