Skip to content

L
linux
Commit 54673088 authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

[libata] bump versions, add MODULE_VERSION() tags 

Also remove dep on CONFIG_EXPERIMENTAL for libata itself,
and several libata drivers.
parent b5625ce6
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 18 deletions
drivers/scsi/Kconfig
View file @ 54673088
...@@ -399,7 +399,7 @@ source "drivers/scsi/megaraid/Kconfig.megaraid" ...@@ -399,7 +399,7 @@ source "drivers/scsi/megaraid/Kconfig.megaraid"
config SCSI_SATA config SCSI_SATA
bool "Serial ATA (SATA) support" bool "Serial ATA (SATA) support"
depends on SCSI && EXPERIMENTAL depends on SCSI
help help
This driver family supports Serial ATA host controllers This driver family supports Serial ATA host controllers
and devices. and devices.
...@@ -408,15 +408,15 @@ config SCSI_SATA ...@@ -408,15 +408,15 @@ config SCSI_SATA
config SCSI_SATA_AHCI config SCSI_SATA_AHCI
tristate "AHCI SATA support" tristate "AHCI SATA support"
depends on SCSI_SATA && PCI && EXPERIMENTAL depends on SCSI_SATA && PCI
help help
This option enables support for AHCI Serial ATA. This option enables support for AHCI Serial ATA.
If unsure, say N. If unsure, say N.
config SCSI_SATA_SVW config SCSI_SATA_SVW
tristate "ServerWorks Frodo / Apple K2 SATA support (EXPERIMENTAL)" tristate "ServerWorks Frodo / Apple K2 SATA support"
depends on SCSI_SATA && PCI && EXPERIMENTAL depends on SCSI_SATA && PCI
help help
This option enables support for Broadcom/Serverworks/Apple K2 This option enables support for Broadcom/Serverworks/Apple K2
SATA support. SATA support.
...@@ -467,7 +467,7 @@ config SCSI_SATA_SIL ...@@ -467,7 +467,7 @@ config SCSI_SATA_SIL
config SCSI_SATA_SIS config SCSI_SATA_SIS
tristate "SiS 964/180 SATA support" tristate "SiS 964/180 SATA support"
depends on SCSI_SATA && PCI depends on SCSI_SATA && PCI && EXPERIMENTAL
help help
This option enables support for SiS Serial ATA 964/180. This option enables support for SiS Serial ATA 964/180.
...@@ -483,7 +483,7 @@ config SCSI_SATA_ULI ...@@ -483,7 +483,7 @@ config SCSI_SATA_ULI
config SCSI_SATA_VIA config SCSI_SATA_VIA
tristate "VIA SATA support" tristate "VIA SATA support"
depends on SCSI_SATA && PCI && EXPERIMENTAL depends on SCSI_SATA && PCI
help help
This option enables support for VIA Serial ATA. This option enables support for VIA Serial ATA.
...@@ -491,7 +491,7 @@ config SCSI_SATA_VIA ...@@ -491,7 +491,7 @@ config SCSI_SATA_VIA
config SCSI_SATA_VITESSE config SCSI_SATA_VITESSE
tristate "VITESSE VSC-7174 SATA support" tristate "VITESSE VSC-7174 SATA support"
depends on SCSI_SATA && PCI && EXPERIMENTAL depends on SCSI_SATA && PCI
help help
This option enables support for Vitesse VSC7174 Serial ATA. This option enables support for Vitesse VSC7174 Serial ATA.
......
drivers/scsi/ata_piix.c
View file @ 54673088
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <linux/libata.h> #include <linux/libata.h>
#define DRV_NAME "ata_piix" #define DRV_NAME "ata_piix"
#define DRV_VERSION "1.02" #define DRV_VERSION "1.03"
enum { enum {
PIIX_IOCFG = 0x54, /* IDE I/O configuration register */ PIIX_IOCFG = 0x54, /* IDE I/O configuration register */
...@@ -247,6 +247,7 @@ MODULE_AUTHOR("Andre Hedrick, Alan Cox, Andrzej Krzysztofowicz, Jeff Garzik"); ...@@ -247,6 +247,7 @@ MODULE_AUTHOR("Andre Hedrick, Alan Cox, Andrzej Krzysztofowicz, Jeff Garzik");
MODULE_DESCRIPTION("SCSI low-level driver for Intel PIIX/ICH ATA controllers"); MODULE_DESCRIPTION("SCSI low-level driver for Intel PIIX/ICH ATA controllers");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE(pci, piix_pci_tbl); MODULE_DEVICE_TABLE(pci, piix_pci_tbl);
MODULE_VERSION(DRV_VERSION);
/** /**
* piix_pata_cbl_detect - Probe host controller cable detect info * piix_pata_cbl_detect - Probe host controller cable detect info
......
drivers/scsi/libata-core.c
View file @ 54673088
...@@ -67,6 +67,7 @@ static struct workqueue_struct *ata_wq; ...@@ -67,6 +67,7 @@ static struct workqueue_struct *ata_wq;
MODULE_AUTHOR("Jeff Garzik"); MODULE_AUTHOR("Jeff Garzik");
MODULE_DESCRIPTION("Library module for ATA devices"); MODULE_DESCRIPTION("Library module for ATA devices");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
/** /**
* ata_tf_load - send taskfile registers to host controller * ata_tf_load - send taskfile registers to host controller
......
drivers/scsi/libata.h
View file @ 54673088
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#define __LIBATA_H__ #define __LIBATA_H__
#define DRV_NAME "libata" #define DRV_NAME "libata"
#define DRV_VERSION "1.02" /* must be exactly four chars */ #define DRV_VERSION "1.10" /* must be exactly four chars */
struct ata_scsi_args { struct ata_scsi_args {
u16 *id; u16 *id;
......
drivers/scsi/sata_nv.c
View file @ 54673088
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include <linux/libata.h> #include <linux/libata.h>
#define DRV_NAME "sata_nv" #define DRV_NAME "sata_nv"
#define DRV_VERSION "0.03" #define DRV_VERSION "0.5"
#define NV_PORTS 2 #define NV_PORTS 2
#define NV_PIO_MASK 0x1f #define NV_PIO_MASK 0x1f
...@@ -234,6 +234,7 @@ MODULE_AUTHOR("NVIDIA"); ...@@ -234,6 +234,7 @@ MODULE_AUTHOR("NVIDIA");
MODULE_DESCRIPTION("low-level driver for NVIDIA nForce SATA controller"); MODULE_DESCRIPTION("low-level driver for NVIDIA nForce SATA controller");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE(pci, nv_pci_tbl); MODULE_DEVICE_TABLE(pci, nv_pci_tbl);
MODULE_VERSION(DRV_VERSION);
irqreturn_t nv_interrupt (int irq, void *dev_instance, struct pt_regs *regs) irqreturn_t nv_interrupt (int irq, void *dev_instance, struct pt_regs *regs)
{ {
......
drivers/scsi/sata_promise.c
View file @ 54673088
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "sata_promise.h" #include "sata_promise.h"
#define DRV_NAME "sata_promise" #define DRV_NAME "sata_promise"
#define DRV_VERSION "1.00" #define DRV_VERSION "1.01"
enum { enum {
...@@ -661,6 +661,7 @@ MODULE_AUTHOR("Jeff Garzik"); ...@@ -661,6 +661,7 @@ MODULE_AUTHOR("Jeff Garzik");
MODULE_DESCRIPTION("Promise SATA TX2/TX4 low-level driver"); MODULE_DESCRIPTION("Promise SATA TX2/TX4 low-level driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE(pci, pdc_ata_pci_tbl); MODULE_DEVICE_TABLE(pci, pdc_ata_pci_tbl);
MODULE_VERSION(DRV_VERSION);
module_init(pdc_ata_init); module_init(pdc_ata_init);
module_exit(pdc_ata_exit); module_exit(pdc_ata_exit);
drivers/scsi/sata_sil.c
View file @ 54673088
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <linux/libata.h> #include <linux/libata.h>
#define DRV_NAME "sata_sil" #define DRV_NAME "sata_sil"
#define DRV_VERSION "0.54" #define DRV_VERSION "0.8"
enum { enum {
sil_3112 = 0, sil_3112 = 0,
...@@ -190,6 +190,7 @@ MODULE_AUTHOR("Jeff Garzik"); ...@@ -190,6 +190,7 @@ MODULE_AUTHOR("Jeff Garzik");
MODULE_DESCRIPTION("low-level driver for Silicon Image SATA controller"); MODULE_DESCRIPTION("low-level driver for Silicon Image SATA controller");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE(pci, sil_pci_tbl); MODULE_DEVICE_TABLE(pci, sil_pci_tbl);
MODULE_VERSION(DRV_VERSION);
static void sil_post_set_mode (struct ata_port *ap) static void sil_post_set_mode (struct ata_port *ap)
{ {
......
drivers/scsi/sata_sis.c
View file @ 54673088
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <linux/libata.h> #include <linux/libata.h>
#define DRV_NAME "sata_sis" #define DRV_NAME "sata_sis"
#define DRV_VERSION "0.10" #define DRV_VERSION "0.5"
enum { enum {
sis_180 = 0, sis_180 = 0,
...@@ -128,6 +128,7 @@ MODULE_AUTHOR("Uwe Koziolek"); ...@@ -128,6 +128,7 @@ MODULE_AUTHOR("Uwe Koziolek");
MODULE_DESCRIPTION("low-level driver for Silicon Integratad Systems SATA controller"); MODULE_DESCRIPTION("low-level driver for Silicon Integratad Systems SATA controller");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE(pci, sis_pci_tbl); MODULE_DEVICE_TABLE(pci, sis_pci_tbl);
MODULE_VERSION(DRV_VERSION);
static unsigned int get_scr_cfg_addr(unsigned int port_no, unsigned int sc_reg) static unsigned int get_scr_cfg_addr(unsigned int port_no, unsigned int sc_reg)
{ {
......
drivers/scsi/sata_svw.c
View file @ 54673088
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#endif /* CONFIG_PPC_OF */ #endif /* CONFIG_PPC_OF */
#define DRV_NAME "sata_svw" #define DRV_NAME "sata_svw"
#define DRV_VERSION "1.04" #define DRV_VERSION "1.05"
/* Taskfile registers offsets */ /* Taskfile registers offsets */
#define K2_SATA_TF_CMD_OFFSET 0x00 #define K2_SATA_TF_CMD_OFFSET 0x00
...@@ -470,6 +470,7 @@ MODULE_AUTHOR("Benjamin Herrenschmidt"); ...@@ -470,6 +470,7 @@ MODULE_AUTHOR("Benjamin Herrenschmidt");
MODULE_DESCRIPTION("low-level driver for K2 SATA controller"); MODULE_DESCRIPTION("low-level driver for K2 SATA controller");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE(pci, k2_sata_pci_tbl); MODULE_DEVICE_TABLE(pci, k2_sata_pci_tbl);
MODULE_VERSION(DRV_VERSION);
module_init(k2_sata_init); module_init(k2_sata_init);
module_exit(k2_sata_exit); module_exit(k2_sata_exit);
drivers/scsi/sata_sx4.c
View file @ 54673088
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "sata_promise.h" #include "sata_promise.h"
#define DRV_NAME "sata_sx4" #define DRV_NAME "sata_sx4"
#define DRV_VERSION "0.50" #define DRV_VERSION "0.7"
enum { enum {
...@@ -1492,6 +1492,7 @@ MODULE_AUTHOR("Jeff Garzik"); ...@@ -1492,6 +1492,7 @@ MODULE_AUTHOR("Jeff Garzik");
MODULE_DESCRIPTION("Promise SATA low-level driver"); MODULE_DESCRIPTION("Promise SATA low-level driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE(pci, pdc_sata_pci_tbl); MODULE_DEVICE_TABLE(pci, pdc_sata_pci_tbl);
MODULE_VERSION(DRV_VERSION);
module_init(pdc_sata_init); module_init(pdc_sata_init);
module_exit(pdc_sata_exit); module_exit(pdc_sata_exit);
drivers/scsi/sata_uli.c
View file @ 54673088
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <linux/libata.h> #include <linux/libata.h>
#define DRV_NAME "sata_uli" #define DRV_NAME "sata_uli"
#define DRV_VERSION "0.11" #define DRV_VERSION "0.2"
enum { enum {
uli_5289 = 0, uli_5289 = 0,
...@@ -123,6 +123,7 @@ MODULE_AUTHOR("Peer Chen"); ...@@ -123,6 +123,7 @@ MODULE_AUTHOR("Peer Chen");
MODULE_DESCRIPTION("low-level driver for ULi Electronics SATA controller"); MODULE_DESCRIPTION("low-level driver for ULi Electronics SATA controller");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE(pci, uli_pci_tbl); MODULE_DEVICE_TABLE(pci, uli_pci_tbl);
MODULE_VERSION(DRV_VERSION);
static unsigned int get_scr_cfg_addr(unsigned int port_no, unsigned int sc_reg) static unsigned int get_scr_cfg_addr(unsigned int port_no, unsigned int sc_reg)
{ {
......
drivers/scsi/sata_via.c
View file @ 54673088
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <asm/io.h> #include <asm/io.h>
#define DRV_NAME "sata_via" #define DRV_NAME "sata_via"
#define DRV_VERSION "0.20" #define DRV_VERSION "1.0"
enum { enum {
via_sata = 0, via_sata = 0,
...@@ -138,6 +138,7 @@ MODULE_AUTHOR("Jeff Garzik"); ...@@ -138,6 +138,7 @@ MODULE_AUTHOR("Jeff Garzik");
MODULE_DESCRIPTION("SCSI low-level driver for VIA SATA controllers"); MODULE_DESCRIPTION("SCSI low-level driver for VIA SATA controllers");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE(pci, svia_pci_tbl); MODULE_DEVICE_TABLE(pci, svia_pci_tbl);
MODULE_VERSION(DRV_VERSION);
static u32 svia_scr_read (struct ata_port *ap, unsigned int sc_reg) static u32 svia_scr_read (struct ata_port *ap, unsigned int sc_reg)
{ {
......
drivers/scsi/sata_vsc.c
View file @ 54673088
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <linux/libata.h> #include <linux/libata.h>
#define DRV_NAME "sata_vsc" #define DRV_NAME "sata_vsc"
#define DRV_VERSION "0.01" #define DRV_VERSION "1.0"
/* Interrupt register offsets (from chip base address) */ /* Interrupt register offsets (from chip base address) */
#define VSC_SATA_INT_STAT_OFFSET 0x00 #define VSC_SATA_INT_STAT_OFFSET 0x00
...@@ -393,6 +393,7 @@ MODULE_AUTHOR("Jeremy Higdon"); ...@@ -393,6 +393,7 @@ MODULE_AUTHOR("Jeremy Higdon");
MODULE_DESCRIPTION("low-level driver for Vitesse VSC7174 SATA controller"); MODULE_DESCRIPTION("low-level driver for Vitesse VSC7174 SATA controller");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DEVICE_TABLE(pci, vsc_sata_pci_tbl); MODULE_DEVICE_TABLE(pci, vsc_sata_pci_tbl);
MODULE_VERSION(DRV_VERSION);
module_init(vsc_sata_init); module_init(vsc_sata_init);
module_exit(vsc_sata_exit); module_exit(vsc_sata_exit);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7