Remove IDE "panic on controller remove" code, since it does nothing,

but makes it impossible to shut down cleanly.

diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index 770b058526339f51f35e54d10e08ceefc8bd5d37..be9b489acb1d0192ecaf0f51ca5c643d08d47cd8 100644 (file)
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -533,19 +533,6 @@ static int __devinit aec62xx_init_one(struct pci_dev *dev, const struct pci_devi
        return 0;
 }
 
-/**
- *     aec62xx_remove_one      -       called when an AEC is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect an AEC device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void aec62xx_remove_one(struct pci_dev *dev)
-{
-       panic("AEC62xx removal not yet supported");
-}
-
 static struct pci_device_id aec62xx_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP850UF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
        { PCI_VENDOR_ID_ARTOP, PCI_DEVICE_ID_ARTOP_ATP860,   PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
@@ -559,7 +546,6 @@ static struct pci_driver driver = {
        name:           "AEC62xx IDE",
        id_table:       aec62xx_pci_tbl,
        probe:          aec62xx_init_one,
-       remove:         __devexit_p(aec62xx_remove_one),
 };
 
 static int aec62xx_ide_init(void)

diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index ba5aa443124ad85687b495363e04deac1bfd4be9..dee0a2c0f21b0df41c8f82e94be259f430cab471 100644 (file)
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -862,19 +862,6 @@ static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_dev
 }
 
 
-/**
- *     ali15x3_remove_one      -       called with an ALi is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect an ALi device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void ali15x3_remove_one(struct pci_dev *dev)
-{
-       panic("ALi removal not yet supported");
-}
-
 static struct pci_device_id alim15x3_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5229, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
        { 0, },
@@ -884,7 +871,6 @@ static struct pci_driver driver = {
        name:           "ALI15x3 IDE",
        id_table:       alim15x3_pci_tbl,
        probe:          alim15x3_init_one,
-       remove:         __devexit_p(ali15x3_remove_one),
 };
 
 static int ali15x3_ide_init(void)

diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 3d456558c3cacead7ed19bf89a7e5647fb28d063..564e585eb72919f5fcae2ee2823fdb1ec04ec806 100644 (file)
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -403,19 +403,6 @@ static int __devinit amd74xx_init_one(struct pci_dev *dev, const struct pci_devi
        return 0;
 }
 
-/**
- *     amd74xx_remove_one      -       called with an AMD IDE is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect an AMD IDE device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void amd74xx_remove_one(struct pci_dev *dev)
-{
-       panic("AMD IDE removal not yet supported");
-}
-
 static struct pci_device_id amd74xx_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_COBRA_7401,      PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_VIPER_7409,      PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
@@ -429,7 +416,6 @@ static struct pci_driver driver = {
        name:           "AMD IDE",
        id_table:       amd74xx_pci_tbl,
        probe:          amd74xx_init_one,
-       remove:         __devexit_p(amd74xx_remove_one),
 };
 
 static int amd74xx_ide_init(void)

diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index 5bfeaa97c18e19ff3183c4232ff00acf8a63b7dc..847d26d7e6fdbf3a08c868306fc1c617f3a10bee 100644 (file)
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -777,19 +777,6 @@ static int __devinit cmd64x_init_one(struct pci_dev *dev, const struct pci_devic
        return 0;
 }
 
-/**
- *     cmd64x_remove_one       -       called with an CMD64x is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect a CMD64x device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void cmd64x_remove_one(struct pci_dev *dev)
-{
-       panic("CMD64x removal not yet supported");
-}
-
 static struct pci_device_id cmd64x_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_643, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_646, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
@@ -802,7 +789,6 @@ static struct pci_driver driver = {
        name:           "CMD64x IDE",
        id_table:       cmd64x_pci_tbl,
        probe:          cmd64x_init_one,
-       remove:         __devexit_p(cmd64x_remove_one),
 };
 
 static int cmd64x_ide_init(void)

diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index 85d85e091b3c338408f927b4f18fa68d68907986..2a974ee018cebc553d3596e30999bfa5b6dbe9a5 100644 (file)
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -430,19 +430,6 @@ static int __devinit cs5530_init_one(struct pci_dev *dev, const struct pci_devic
        return 0;
 }
 
-/**
- *     cs5530_remove_one       -       called when a CS5530 is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect an Cyrix device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void cs5530_remove_one(struct pci_dev *dev)
-{
-       panic("Cyrix removal not yet supported");
-}
-
 static struct pci_device_id cs5530_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { 0, },
@@ -452,7 +439,6 @@ static struct pci_driver driver = {
        name:           "CS5530 IDE",
        id_table:       cs5530_pci_tbl,
        probe:          cs5530_init_one,
-       remove:         __devexit_p(cs5530_remove_one),
 };
 
 static int cs5530_ide_init(void)

diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index 6292a715b4fb743ec40b5473e3669747672a7346..b63a918413931c8b21d2d1897602d690935ff61f 100644 (file)
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -428,19 +428,6 @@ static int __devinit cy82c693_init_one(struct pci_dev *dev, const struct pci_dev
        return 0;
 }
 
-/**
- *     cy82c693_remove_one     -       called with an Cypress is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect an Cypress device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void cy82c693_remove_one(struct pci_dev *dev)
-{
-       panic("Cypress removal not yet supported");
-}
-
 static struct pci_device_id cy82c693_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { 0, },
@@ -450,7 +437,6 @@ static struct pci_driver driver = {
        name:           "Cypress IDE",
        id_table:       cy82c693_pci_tbl,
        probe:          cy82c693_init_one,
-       remove:         __devexit_p(cy82c693_remove_one),
 };
 
 static int cy82c693_ide_init(void)

diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index 7de03692f9fffab201e9822237a1ff3fde17b8b9..353d02906dca6befc60a68e8858142f8d058ca61 100644 (file)
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -118,19 +118,6 @@ static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_devi
        return 0;
 }
 
-/**
- *     generic_remove_one      -       called when PCI IDE is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect an IDE device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void generic_remove_one(struct pci_dev *dev)
-{
-       panic("PCI IDE removal not yet supported");
-}
-
 static struct pci_device_id generic_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_NS,     PCI_DEVICE_ID_NS_87410,            PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { PCI_VENDOR_ID_PCTECH, PCI_DEVICE_ID_PCTECH_SAMURAI_IDE,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
@@ -148,7 +135,6 @@ static struct pci_driver driver = {
        name:           "PCI IDE",
        id_table:       generic_pci_tbl,
        probe:          generic_init_one,
-       remove:         __devexit_p(generic_remove_one),
 };
 
 static int generic_ide_init(void)

diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 490b6d3cb9af909514b13a96bb3e5530e9c55ea7..5baf197540e7cb5e482170fc45cae95ff10614df 100644 (file)
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -337,19 +337,6 @@ static int __devinit hpt34x_init_one(struct pci_dev *dev, const struct pci_devic
        return 0;
 }
 
-/**
- *     hpt34x_remove_one       -       called with an hpt34x is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect an hpt34x device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void hpt34x_remove_one(struct pci_dev *dev)
-{
-       panic("hpt34x removal not yet supported");
-}
-
 static struct pci_device_id hpt34x_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_TTI, PCI_DEVICE_ID_TTI_HPT343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { 0, },
@@ -359,7 +346,6 @@ static struct pci_driver driver = {
        name:           "HPT34x IDE",
        id_table:       hpt34x_pci_tbl,
        probe:          hpt34x_init_one,
-       remove:         __devexit_p(hpt34x_remove_one),
 };
 
 static int hpt34x_ide_init(void)

diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 5e25e0bb73f15b767966868e0242f9c9f737a975..a4b1f7e1b33bd6b9dd9b79fc726c33aa78e0dc93 100644 (file)
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1188,19 +1188,6 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic
        return 0;
 }
 
-/**
- *     hpt366_remove_one       -       called when an HPT366 is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect a HPT366 device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void hpt366_remove_one(struct pci_dev *dev)
-{
-       panic("HPT366 removal not yet supported");
-}
-
 static struct pci_device_id hpt366_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_TTI, PCI_DEVICE_ID_TTI_HPT366, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { PCI_VENDOR_ID_TTI, PCI_DEVICE_ID_TTI_HPT372, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
@@ -1214,7 +1201,6 @@ static struct pci_driver driver = {
        name:           "HPT366 IDE",
        id_table:       hpt366_pci_tbl,
        probe:          hpt366_init_one,
-       remove:         __devexit_p(hpt366_remove_one),
 };
 
 static int hpt366_ide_init(void)

diff --git a/drivers/ide/pci/it8172.c b/drivers/ide/pci/it8172.c
index 07a3d0080fb24b847f2d3a200381da9fcc8dc564..7e38e63a14958e0c140f032945b88e582152f6c3 100644 (file)
--- a/drivers/ide/pci/it8172.c
+++ b/drivers/ide/pci/it8172.c
@@ -308,19 +308,6 @@ static int __devinit it8172_init_one(struct pci_dev *dev, const struct pci_devic
        return 0;
 }
 
-/**
- *     it8172_remove_one       -       called with an IT8172 is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect an IT8172 device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void it8172_remove_one(struct pci_dev *dev)
-{
-       panic("IT8172 removal not yet supported");
-}
-
 static struct pci_device_id it8172_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_ITE, PCI_DEVICE_ID_ITE_IT8172G, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { 0, },
@@ -330,7 +317,6 @@ static struct pci_driver driver = {
        name:           "IT8172IDE",
        id_table:       it8172_pci_tbl,
        probe:          it8172_init_one,
-       remove:         __devexit_p(it8172_remove_one),
 };
 
 static int it8172_ide_init(void)

diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index b113158a993758c79575fc201fffb74ede25465a..5a9e8dd5fec49ce9b6dfb5f4c87f697edd08f89c 100644 (file)
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -239,19 +239,6 @@ static int __devinit ns87415_init_one(struct pci_dev *dev, const struct pci_devi
        return 0;
 }
 
-/**
- *     ns87415_remove_one      -       called with an NS87415 is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect an NS87415 device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void ns87415_remove_one(struct pci_dev *dev)
-{
-       panic("NS87415 removal not yet supported");
-}
-
 static struct pci_device_id ns87415_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87415, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { 0, },
@@ -261,7 +248,6 @@ static struct pci_driver driver = {
        name:           "NS87415IDE",
        id_table:       ns87415_pci_tbl,
        probe:          ns87415_init_one,
-       remove:         __devexit_p(ns87415_remove_one),
 };
 
 static int ns87415_ide_init(void)

diff --git a/drivers/ide/pci/nvidia.c b/drivers/ide/pci/nvidia.c
index 1c073eba731d8092fae2719091d51d8048703a40..7be314a7f5ff7bfd81e78a3ce3cc905066d2ddc1 100644 (file)
--- a/drivers/ide/pci/nvidia.c
+++ b/drivers/ide/pci/nvidia.c
@@ -346,19 +346,6 @@ static int __devinit nforce_init_one(struct pci_dev *dev, const struct pci_devic
        return 0;
 }
 
-/**
- *     nforce_remove_one       -       called with an nForce is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect an nForce device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void nforce_remove_one(struct pci_dev *dev)
-{
-       panic("nForce removal not yet supported");
-}
-
 static struct pci_device_id nforce_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { 0, },
@@ -368,7 +355,6 @@ static struct pci_driver driver = {
        name:           "nForce IDE",
        id_table:       nforce_pci_tbl,
        probe:          nforce_init_one,
-       remove:         __devexit_p(nforce_remove_one),
 };
 
 static int nforce_ide_init(void)

diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
index 02b4b1ee6acc91e239dc00d6865d201acca1810b..0b491210fa573123c9da32dfb4970805d6972529 100644 (file)
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
@@ -373,19 +373,6 @@ static int __devinit opti621_init_one(struct pci_dev *dev, const struct pci_devi
        return 0;
 }
 
-/**
- *     opti621_remove_one      -       called with an Opti621 is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect an Opti621 device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void opti621_remove_one(struct pci_dev *dev)
-{
-       panic("Opti621 removal not yet supported");
-}
-
 static struct pci_device_id opti621_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_OPTI, PCI_DEVICE_ID_OPTI_82C621, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { PCI_VENDOR_ID_OPTI, PCI_DEVICE_ID_OPTI_82C825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
@@ -396,7 +383,6 @@ static struct pci_driver driver = {
        name:           "Opti621 IDE",
        id_table:       opti621_pci_tbl,
        probe:          opti621_init_one,
-       remove:         __devexit_p(opti621_remove_one),
 };
 
 static int opti621_ide_init(void)

diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index 276df401938e56079c97004644fc04cee2dfd7b8..abdefb40956a5dd01229114c83e1a8814b292ca5 100644 (file)
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -666,19 +666,6 @@ static int __devinit pdc202new_init_one(struct pci_dev *dev, const struct pci_de
        return 0;
 }
 
-/**
- *     pdc202new_remove_one    -       called when a pdc202xx is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect an IDE device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void pdc202new_remove_one(struct pci_dev *dev)
-{
-       panic("Promise IDE removal not yet supported");
-}
-
 static struct pci_device_id pdc202new_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20268, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20269, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
@@ -694,7 +681,6 @@ static struct pci_driver driver = {
        name:           "Promise IDE",
        id_table:       pdc202new_pci_tbl,
        probe:          pdc202new_init_one,
-       remove:         __devexit_p(pdc202new_remove_one),
 };
 
 static int pdc202new_ide_init(void)

diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 9da7f883425115084e063c2034d966f1d162d8ba..6c89e77fadc8e4eeccc52e0671883a3b89fdd41a 100644 (file)
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -938,19 +938,6 @@ static int __devinit pdc202xx_init_one(struct pci_dev *dev, const struct pci_dev
        return 0;
 }
 
-/**
- *     pdc202xx_remove_one     -       called with the IDE to be unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect an IDE device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void pdc202xx_remove_one(struct pci_dev *dev)
-{
-       panic("Promise IDE removal not yet supported");
-}
-
 static struct pci_device_id pdc202xx_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20246, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { PCI_VENDOR_ID_PROMISE, PCI_DEVICE_ID_PROMISE_20262, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
@@ -964,7 +951,6 @@ static struct pci_driver driver = {
        name:           "Promise Old IDE",
        id_table:       pdc202xx_pci_tbl,
        probe:          pdc202xx_init_one,
-       remove:         __devexit_p(pdc202xx_remove_one),
 };
 
 static int pdc202xx_ide_init(void)

diff --git a/drivers/ide/pci/pdcadma.c b/drivers/ide/pci/pdcadma.c
index df801c9a5bbf41286a44baa77222a54ad866d869..7c0f47096ddec3436b9734ce4509fe6ccfe767c7 100644 (file)
--- a/drivers/ide/pci/pdcadma.c
+++ b/drivers/ide/pci/pdcadma.c
@@ -136,19 +136,6 @@ static int __devinit pdcadma_init_one(struct pci_dev *dev, const struct pci_devi
        return 1;
 }
 
-/**
- *     pdcadma_remove_one      -       called when a PDCADMA is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect a PDCADMA device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void pdcadma_remove_one(struct pci_dev *dev)
-{
-       panic("PDCADMA removal not yet supported");
-}
-
 static struct pci_device_id pdcadma_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_PDC, PCI_DEVICE_ID_PDC_1841, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { 0, },
@@ -158,7 +145,6 @@ static struct pci_driver driver = {
        name:           "PDCADMA-IDE",
        id_table:       pdcadma_pci_tbl,
        probe:          pdcadma_init_one,
-       remove:         __devexit_p(pdcadma_remove_one),
 };
 
 static int pdcadma_ide_init(void)

diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index 34b743fd1521752d95ec7ec753cc129d783216e7..fa92084ccda39e94dfc35082da32b66ca085549d 100644 (file)
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -683,19 +683,6 @@ static int __devinit piix_init_one(struct pci_dev *dev, const struct pci_device_
        return 0;
 }
 
-/**
- *     piix_remove_one -       called with a PIIX is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect a PIIX device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void piix_remove_one(struct pci_dev *dev)
-{
-       panic("PIIX removal not yet supported");
-}
-
 static struct pci_device_id piix_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371FB_0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371FB_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
@@ -720,7 +707,6 @@ static struct pci_driver driver = {
        name:           "PIIX IDE",
        id_table:       piix_pci_tbl,
        probe:          piix_init_one,
-       remove:         __devexit_p(piix_remove_one),
 };
 
 static int piix_ide_init(void)

diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c
index 26868da97c472d3985af9dc44aaea0f45fb56d94..d4e93888559e6df9cd3ec5847a4382246f8cd619 100644 (file)
--- a/drivers/ide/pci/rz1000.c
+++ b/drivers/ide/pci/rz1000.c
@@ -65,19 +65,6 @@ static int __devinit rz1000_init_one(struct pci_dev *dev, const struct pci_devic
        return 0;
 }
 
-/**
- *     rz1000_remove_one       -       called with an RZ1000 is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect an RZ1000 device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void rz1000_remove_one(struct pci_dev *dev)
-{
-       panic("RZ1000 removal not yet supported");
-}
-
 static struct pci_device_id rz1000_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_PCTECH, PCI_DEVICE_ID_PCTECH_RZ1000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { PCI_VENDOR_ID_PCTECH, PCI_DEVICE_ID_PCTECH_RZ1001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
@@ -88,7 +75,6 @@ static struct pci_driver driver = {
        name:           "RZ1000 IDE",
        id_table:       rz1000_pci_tbl,
        probe:          rz1000_init_one,
-       remove:         __devexit_p(rz1000_remove_one),
 };
 
 static int rz1000_ide_init(void)

diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index a61cc9451b7a9108892eb5837e2687b4a3ce27c6..64ff9a25a0c4f03356e45752b0a6960d41e55b65 100644 (file)
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -787,19 +787,6 @@ static int __devinit svwks_init_one(struct pci_dev *dev, const struct pci_device
        return 0;
 }
 
-/**
- *     svwks_remove_one        -       called when an OSB/CSB is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect a SVWKS device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void svwks_remove_one(struct pci_dev *dev)
-{
-       panic("SVWKS removal not yet supported");
-}
-
 static struct pci_device_id svwks_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
@@ -812,7 +799,6 @@ static struct pci_driver driver = {
        name:           "Serverworks IDE",
        id_table:       svwks_pci_tbl,
        probe:          svwks_init_one,
-       remove:         __devexit_p(svwks_remove_one),
 #if 0  /* FIXME: implement */
        suspend:        ,
        resume:         ,

diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index bedf6e18e2185da1761fdc6f968798e150fc8cfe..da40fecedb6d8ad5f38d62c005bc9e4aba23d72c 100644 (file)
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -847,19 +847,6 @@ static int __devinit siimage_init_one(struct pci_dev *dev, const struct pci_devi
        return 0;
 }
 
-/**
- *     siimage_remove_one      -       called when an SI IDE is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect an IDE device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void siimage_remove_one(struct pci_dev *dev)
-{
-       panic("SiImage IDE removal not yet supported");
-}
-
 static struct pci_device_id siimage_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_680,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
@@ -870,7 +857,6 @@ static struct pci_driver driver = {
        name:           "SiI IDE",
        id_table:       siimage_pci_tbl,
        probe:          siimage_init_one,
-       remove:         __devexit_p(siimage_remove_one),
 };
 
 static int siimage_ide_init(void)

diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index e0325914d036df86b7e44222a128394f73c1b6b4..de20926972cfcf28a431045c17a02209b7647295 100644 (file)
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -1033,19 +1033,6 @@ static int __devinit sis5513_init_one(struct pci_dev *dev, const struct pci_devi
        return 0;
 }
 
-/**
- *     sis5513_remove_one      -       called when SIS IDE is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect a SIS IDE device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void sis5513_remove_one(struct pci_dev *dev)
-{
-       panic("SIS IDE removal not yet supported");
-}
-
 static struct pci_device_id sis5513_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5513, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { 0, },
@@ -1055,7 +1042,6 @@ static struct pci_driver driver = {
        name:           "SIS IDE",
        id_table:       sis5513_pci_tbl,
        probe:          sis5513_init_one,
-       remove:         __devexit_p(sis5513_remove_one),
 };
 
 static int sis5513_ide_init(void)

diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index ac71aff9236c3d141ca95564efe1d0c8af52aa81..fcb2f21bca60a4b5e8e4edf788ab9c2575354979 100644 (file)
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -291,19 +291,6 @@ static int __devinit sl82c105_init_one(struct pci_dev *dev, const struct pci_dev
        return 0;
 }
 
-/**
- *     sl82c105_remove_one     -       called with an SLC82c105 is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect an W82C105 device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void sl82c105_remove_one(struct pci_dev *dev)
-{
-       panic("W82C105 removal not yet supported");
-}
-
 static struct pci_device_id sl82c105_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { 0, },
@@ -313,7 +300,6 @@ static struct pci_driver driver = {
        name:           "W82C105 IDE",
        id_table:       sl82c105_pci_tbl,
        probe:          sl82c105_init_one,
-       remove:         __devexit_p(sl82c105_remove_one),
 };
 
 static int sl82c105_ide_init(void)

diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index 6053612a0dca5bf63a733c40674c3c2e68542a88..063b409bfc75e05a3d1f94e1cb843d1b864dacd7 100644 (file)
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -375,19 +375,6 @@ static int __devinit slc90e66_init_one(struct pci_dev *dev, const struct pci_dev
        return 0;
 }
 
-/**
- *     slc90e66_remove_one     -       called with an slc90e66 is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect an slc90e66 device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void slc90e66_remove_one(struct pci_dev *dev)
-{
-       panic("slc90e66 removal not yet supported");
-}
-
 static struct pci_device_id slc90e66_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { 0, },
@@ -397,7 +384,6 @@ static struct pci_driver driver = {
        name:           "SLC90e66 IDE",
        id_table:       slc90e66_pci_tbl,
        probe:          slc90e66_init_one,
-       remove:         __devexit_p(slc90e66_remove_one),
 };
 
 static int slc90e66_ide_init(void)

diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index 5cfb244112993504bea42c878f880e819a349fb6..afca072c5d3b74e6cd96c5a2dc725d4e28a440b9 100644 (file)
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -406,19 +406,6 @@ static int __devinit trm290_init_one(struct pci_dev *dev, const struct pci_devic
        return 0;
 }
 
-/**
- *     trm290_remove_one       -       called when an trm290 is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect a trm290 device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void trm290_remove_one(struct pci_dev *dev)
-{
-       panic("trm290 removal not yet supported");
-}
-
 static struct pci_device_id trm290_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_TEKRAM, PCI_DEVICE_ID_TEKRAM_DC290, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { 0, },
@@ -428,7 +415,6 @@ static struct pci_driver driver = {
        name:           "TRM290 IDE",
        id_table:       trm290_pci_tbl,
        probe:          trm290_init_one,
-       remove:         __devexit_p(trm290_remove_one),
 };
 
 static int trm290_ide_init(void)

diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 59736cfcb88d2f24c3b78c0d3c0d7b2a9d865f94..aa5c3ff5a6daa1bbd86ac9aba2f65650799ba36a 100644 (file)
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -644,19 +644,6 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i
        return 0;
 }
 
-/**
- *     via_remove_one  -       called with a VIA IDE interface is unplugged
- *     @dev: the device that was removed
- *
- *     Disconnect a VIA IDE device that has been unplugged either by hotplug
- *     or by a more civilized notification scheme. Not yet supported.
- */
- 
-static void via_remove_one(struct pci_dev *dev)
-{
-       panic("VIA IDE removal not yet supported");
-}
-
 static struct pci_device_id via_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C576_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
@@ -667,7 +654,6 @@ static struct pci_driver driver = {
        name:           "VIA IDE",
        id_table:       via_pci_tbl,
        probe:          via_init_one,
-       remove:         __devexit_p(via_remove_one),
 };
 
 static int via_ide_init(void)