From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761240AbYGFRqh (ORCPT ); Sun, 6 Jul 2008 13:46:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758989AbYGFRgB (ORCPT ); Sun, 6 Jul 2008 13:36:01 -0400 Received: from ug-out-1314.google.com ([66.249.92.171]:13310 "EHLO ug-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758459AbYGFRfY (ORCPT ); Sun, 6 Jul 2008 13:35:24 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=references:date:from:to:cc:subject:content-disposition:message-id; b=dyCfgBvkn3NY1DtM+MFKePes0g7MR05qqYpTEvzhobGM1C7ZpqxTpPaAlHq8zhuWAI NadvJUOFeU9w8WcTC7YrTB1vai2BHeAJRAwooqmIPO0Z99LJOwjwDWcR6VhS1r83T4F4 qT8RNZgmQGZGhoTiqOKdBY6fY/fU/RioxVn34= References: <20080706172010.559358957@bzolnier@gmail.com> Date: Sun, 06 Jul 2008 19:20:45 +0200 From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 35/50] pdc202xx_new: add ->remove method and module_exit() Content-Disposition: inline; filename=pdc202xx_new-add-remove-method-and-module_exit.patch Message-ID: <4871025a.1ade660a.3458.62c3@mx.google.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/pci/pdc202xx_new.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) Index: b/drivers/ide/pci/pdc202xx_new.c =================================================================== --- a/drivers/ide/pci/pdc202xx_new.c +++ b/drivers/ide/pci/pdc202xx_new.c @@ -543,6 +543,15 @@ static int __devinit pdc202new_init_one( return ide_pci_init_one(dev, d, NULL); } +static void __devexit pdc202new_remove(struct pci_dev *dev) +{ + struct ide_host *host = pci_get_drvdata(dev); + struct pci_dev *dev2 = host->dev[1] ? to_pci_dev(host->dev[1]) : NULL; + + ide_pci_remove(dev); + pci_dev_put(dev2); +} + static const struct pci_device_id pdc202new_pci_tbl[] = { { PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20268), 0 }, { PCI_VDEVICE(PROMISE, PCI_DEVICE_ID_PROMISE_20269), 1 }, @@ -559,6 +568,7 @@ static struct pci_driver driver = { .name = "Promise_IDE", .id_table = pdc202new_pci_tbl, .probe = pdc202new_init_one, + .remove = pdc202new_remove, }; static int __init pdc202new_ide_init(void) @@ -566,7 +576,13 @@ static int __init pdc202new_ide_init(voi return ide_pci_register_driver(&driver); } +static void __exit pdc202new_ide_exit(void) +{ + pci_unregister_driver(&driver); +} + module_init(pdc202new_ide_init); +module_exit(pdc202new_ide_exit); MODULE_AUTHOR("Andre Hedrick, Frank Tiernan"); MODULE_DESCRIPTION("PCI driver module for Promise PDC20268 and higher"); --