Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
Pull libata updates from Jeff Garzik:
"Simple stuff. See one-line summaries."
* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_samsung_cf: use module_platform_driver_probe()
[libata] Avoid specialized TLA's in ZPODD's Kconfig
libata-acpi.c: fix copy and paste mistake in ata_acpi_register_power_resource
sata_fsl: Remove redundant NULL check before kfree
ahci: Add Device IDs for Intel Wellsburg PCH
ata_piix: Add MODULE_PARM_DESC to prefer_ms_hyperv
+16
-21
+7
-6
drivers/ata/Kconfig
+7
-6
drivers/ata/Kconfig
···
59
59
option libata.noacpi=1
60
60
61
61
config SATA_ZPODD
62
-
bool "SATA Zero Power ODD Support"
62
+
bool "SATA Zero Power Optical Disc Drive (ZPODD) support"
63
63
depends on ATA_ACPI
64
64
default n
65
65
help
66
-
This option adds support for SATA ZPODD. It requires both
67
-
ODD and the platform support, and if enabled, will automatically
68
-
power on/off the ODD when certain condition is satisfied. This
69
-
does not impact user's experience of the ODD, only power is saved
70
-
when ODD is not in use(i.e. no disc inside).
66
+
This option adds support for SATA Zero Power Optical Disc
67
+
Drive (ZPODD). It requires both the ODD and the platform
68
+
support, and if enabled, will automatically power on/off the
69
+
ODD when certain condition is satisfied. This does not impact
70
+
end user's experience of the ODD, only power is saved when
71
+
the ODD is not in use (i.e. no disc inside).
71
72
72
73
If unsure, say N.
73
74
+2
drivers/ata/ahci.c
+2
drivers/ata/ahci.c
···
281
281
{ PCI_VDEVICE(INTEL, 0x1f37), board_ahci }, /* Avoton RAID */
282
282
{ PCI_VDEVICE(INTEL, 0x1f3e), board_ahci }, /* Avoton RAID */
283
283
{ PCI_VDEVICE(INTEL, 0x1f3f), board_ahci }, /* Avoton RAID */
284
+
{ PCI_VDEVICE(INTEL, 0x2823), board_ahci }, /* Wellsburg RAID */
285
+
{ PCI_VDEVICE(INTEL, 0x2827), board_ahci }, /* Wellsburg RAID */
284
286
{ PCI_VDEVICE(INTEL, 0x8d02), board_ahci }, /* Wellsburg AHCI */
285
287
{ PCI_VDEVICE(INTEL, 0x8d04), board_ahci }, /* Wellsburg RAID */
286
288
{ PCI_VDEVICE(INTEL, 0x8d06), board_ahci }, /* Wellsburg RAID */
+4
drivers/ata/ata_piix.c
+4
drivers/ata/ata_piix.c
···
1547
1547
1548
1548
static int prefer_ms_hyperv = 1;
1549
1549
module_param(prefer_ms_hyperv, int, 0);
1550
+
MODULE_PARM_DESC(prefer_ms_hyperv,
1551
+
"Prefer Hyper-V paravirtualization drivers instead of ATA, "
1552
+
"0 - Use ATA drivers, "
1553
+
"1 (Default) - Use the paravirtualization drivers.");
1550
1554
1551
1555
static void piix_ignore_devices_quirk(struct ata_host *host)
1552
1556
{
+1
-1
drivers/ata/libata-acpi.c
+1
-1
drivers/ata/libata-acpi.c
···
1027
1027
1028
1028
handle = ata_dev_acpi_handle(dev);
1029
1029
if (handle)
1030
-
acpi_dev_pm_remove_dependent(handle, &sdev->sdev_gendev);
1030
+
acpi_dev_pm_add_dependent(handle, &sdev->sdev_gendev);
1031
1031
}
1032
1032
1033
1033
static void ata_acpi_unregister_power_resource(struct ata_device *dev)
+1
-12
drivers/ata/pata_samsung_cf.c
+1
-12
drivers/ata/pata_samsung_cf.c
···
661
661
},
662
662
};
663
663
664
-
static int __init pata_s3c_init(void)
665
-
{
666
-
return platform_driver_probe(&pata_s3c_driver, pata_s3c_probe);
667
-
}
668
-
669
-
static void __exit pata_s3c_exit(void)
670
-
{
671
-
platform_driver_unregister(&pata_s3c_driver);
672
-
}
673
-
674
-
module_init(pata_s3c_init);
675
-
module_exit(pata_s3c_exit);
664
+
module_platform_driver_probe(pata_s3c_driver, pata_s3c_probe);
676
665
677
666
MODULE_AUTHOR("Abhilash Kesavan, <a.kesavan@samsung.com>");
678
667
MODULE_DESCRIPTION("low-level driver for Samsung PATA controller");