[PATCH 1/5] Revert "UBUNTU: SAUCE: ata_piix: add a disable_driver option"

Andy Whitcroft apw at canonical.com
Wed Dec 5 10:30:55 UTC 2012


This reverts commit 76a644330362343a8e499bf50c373e8a1b8fa02a.

BugLink: http://bugs.launchpad.net/bugs/1079084
Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 drivers/ata/ata_piix.c |    7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 0d2cf7e..1952869 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -1708,16 +1708,10 @@ static void piix_remove_one(struct pci_dev *pdev)
 	ata_pci_remove_one(pdev);
 }
 
-static bool disable_driver = 0;
 static int __init piix_init(void)
 {
 	int rc;
 
-	if (disable_driver) {
-		printk(KERN_WARNING "ata_piix: driver disabled completely\n");
-		return 0;
-	}
-
 	DPRINTK("pci_register_driver\n");
 	rc = pci_register_driver(&piix_pci_driver);
 	if (rc)
@@ -1738,4 +1732,3 @@ module_init(piix_init);
 module_exit(piix_exit);
 
 module_param(prefer_ms_hyperv, int, 0);
-module_param(disable_driver, bool, 0);
-- 
1.7.10.4





More information about the kernel-team mailing list