From 21ad9f74c6ee00eeae8084c82c4aa22ef7c3574b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristina=20Mart=C5=A1enko?= Date: Thu, 24 Jul 2014 20:52:57 +0300 Subject: [PATCH] staging: phison: remove driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The driver hasn't been cleaned up and it doesn't look like anyone is working on it anymore (including the original author). So remove the driver from the kernel. If someone wants to work on cleaning it up and moving it out of staging, this commit can be reverted. Signed-off-by: Kristina Martšenko Cc: Evan Ko Signed-off-by: Greg Kroah-Hartman --- drivers/staging/Kconfig | 2 - drivers/staging/Makefile | 1 - drivers/staging/phison/Kconfig | 5 -- drivers/staging/phison/Makefile | 1 - drivers/staging/phison/phison.c | 94 --------------------------------- 5 files changed, 103 deletions(-) delete mode 100644 drivers/staging/phison/Kconfig delete mode 100644 drivers/staging/phison/Makefile delete mode 100644 drivers/staging/phison/phison.c diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 5b14f0d8d1b8..be3f91c64f78 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -54,8 +54,6 @@ source "drivers/staging/rtl8821ae/Kconfig" source "drivers/staging/rts5208/Kconfig" -source "drivers/staging/phison/Kconfig" - source "drivers/staging/line6/Kconfig" source "drivers/staging/octeon/Kconfig" diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index d4536df8b69b..a4408a8db812 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -19,7 +19,6 @@ obj-$(CONFIG_R8192EE) += rtl8192ee/ obj-$(CONFIG_R8723AU) += rtl8723au/ obj-$(CONFIG_R8821AE) += rtl8821ae/ obj-$(CONFIG_RTS5208) += rts5208/ -obj-$(CONFIG_IDE_PHISON) += phison/ obj-$(CONFIG_LINE6_USB) += line6/ obj-$(CONFIG_NETLOGIC_XLR_NET) += netlogic/ obj-$(CONFIG_OCTEON_ETHERNET) += octeon/ diff --git a/drivers/staging/phison/Kconfig b/drivers/staging/phison/Kconfig deleted file mode 100644 index 1b56119a7657..000000000000 --- a/drivers/staging/phison/Kconfig +++ /dev/null @@ -1,5 +0,0 @@ -config IDE_PHISON - tristate "PCIE ATA PS5000 IDE support" - depends on PCI && ATA && ATA_SFF && ATA_BMDMA - ---help--- - This is an experimental driver for PS5000 IDE driver. diff --git a/drivers/staging/phison/Makefile b/drivers/staging/phison/Makefile deleted file mode 100644 index 7642a2190e91..000000000000 --- a/drivers/staging/phison/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_IDE_PHISON) += phison.o diff --git a/drivers/staging/phison/phison.c b/drivers/staging/phison/phison.c deleted file mode 100644 index 3826561e7742..000000000000 --- a/drivers/staging/phison/phison.c +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (C) 2006 Red Hat - * - * May be copied or modified under the terms of the GNU General Public License - * - * [Modify History] - * #0001, Evan, 2008.10.22, V0.00, New release. - * #0002, Evan, 2008.11.01, V0.90, Test Work In Ubuntu Linux 8.04. - * #0003, Evan, 2008.01.08, V0.91, Change Name "PCIE-SSD" to "E-BOX". - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define PHISON_DEBUG - -#define DRV_NAME "phison_e-box" /* #0003 */ -#define DRV_VERSION "0.91" /* #0003 */ - -#define PCI_VENDOR_ID_PHISON 0x1987 -#define PCI_DEVICE_ID_PS5000 0x5000 - -static int phison_pre_reset(struct ata_link *link, unsigned long deadline) -{ - int ret; - struct ata_port *ap = link->ap; - - ap->cbl = ATA_CBL_NONE; - ret = ata_std_prereset(link, deadline); - dev_dbg(ap->dev, "phison_pre_reset(), ret = %x\n", ret); - return ret; -} - -static struct scsi_host_template phison_sht = { - ATA_BMDMA_SHT(DRV_NAME), -}; - -static struct ata_port_operations phison_ops = { - .inherits = &ata_bmdma_port_ops, - .prereset = phison_pre_reset, -}; - -static int phison_init_one(struct pci_dev *pdev, const struct pci_device_id *id) -{ - int ret; - struct ata_port_info info = { - .flags = ATA_FLAG_NO_ATAPI, - - .pio_mask = 0x1f, - .mwdma_mask = 0x07, - .udma_mask = ATA_UDMA5, - - .port_ops = &phison_ops, - }; - const struct ata_port_info *ppi[] = { &info, NULL }; - - ret = ata_pci_bmdma_init_one(pdev, ppi, &phison_sht, NULL, 0); - - dev_dbg(&pdev->dev, "phison_init_one(), ret = %x\n", ret); - - return ret; -} - -static const struct pci_device_id phison_pci_tbl[] = { - { PCI_DEVICE(PCI_VENDOR_ID_PHISON, PCI_DEVICE_ID_PS5000), - PCI_CLASS_STORAGE_IDE << 8, 0xffff00, 0 }, - { 0, }, -}; -MODULE_DEVICE_TABLE(pci, phison_pci_tbl); - -static struct pci_driver phison_pci_driver = { - .name = DRV_NAME, - .id_table = phison_pci_tbl, - .probe = phison_init_one, - .remove = ata_pci_remove_one, -#ifdef CONFIG_PM /* haven't tested it. */ - .suspend = ata_pci_device_suspend, - .resume = ata_pci_device_resume, -#endif -}; - -module_pci_driver(phison_pci_driver); - -MODULE_AUTHOR("Evan Ko"); -MODULE_DESCRIPTION("PCIE driver module for PHISON PS5000 E-BOX"); -MODULE_LICENSE("GPL"); -MODULE_VERSION(DRV_VERSION);