lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

Browse Source 
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
This commit is contained in:
Linus Torvalds
2013-03-23 12:33:36 -07:00
parent df2a8f39cd b186affe0c
commit c8c1f16717
6 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/ata/Kconfig
View File

@@ -59,15 +59,16 @@ config ATA_ACPI
option libata.noacpi=1 option libata.noacpi=1
config SATA_ZPODD config SATA_ZPODD
bool "SATA Zero Power ODD Support" bool "SATA Zero Power Optical Disc Drive (ZPODD) support"
depends on ATA_ACPI depends on ATA_ACPI
default n default n
help help
This option adds support for SATA ZPODD. It requires both This option adds support for SATA Zero Power Optical Disc
ODD and the platform support, and if enabled, will automatically Drive (ZPODD). It requires both the ODD and the platform
power on/off the ODD when certain condition is satisfied. This support, and if enabled, will automatically power on/off the
does not impact user's experience of the ODD, only power is saved ODD when certain condition is satisfied. This does not impact
when ODD is not in use(i.e. no disc inside). end user's experience of the ODD, only power is saved when
the ODD is not in use (i.e. no disc inside).
If unsure, say N. If unsure, say N.

2
drivers/ata/ahci.c
View File

@@ -281,6 +281,8 @@ static const struct pci_device_id ahci_pci_tbl[] = {
{ PCI_VDEVICE(INTEL, 0x1f37), board_ahci }, /* Avoton RAID */ { PCI_VDEVICE(INTEL, 0x1f37), board_ahci }, /* Avoton RAID */
{ PCI_VDEVICE(INTEL, 0x1f3e), board_ahci }, /* Avoton RAID */ { PCI_VDEVICE(INTEL, 0x1f3e), board_ahci }, /* Avoton RAID */
{ PCI_VDEVICE(INTEL, 0x1f3f), board_ahci }, /* Avoton RAID */ { PCI_VDEVICE(INTEL, 0x1f3f), board_ahci }, /* Avoton RAID */
{ PCI_VDEVICE(INTEL, 0x2823), board_ahci }, /* Wellsburg RAID */
{ PCI_VDEVICE(INTEL, 0x2827), board_ahci }, /* Wellsburg RAID */
{ PCI_VDEVICE(INTEL, 0x8d02), board_ahci }, /* Wellsburg AHCI */ { PCI_VDEVICE(INTEL, 0x8d02), board_ahci }, /* Wellsburg AHCI */
{ PCI_VDEVICE(INTEL, 0x8d04), board_ahci }, /* Wellsburg RAID */ { PCI_VDEVICE(INTEL, 0x8d04), board_ahci }, /* Wellsburg RAID */
{ PCI_VDEVICE(INTEL, 0x8d06), board_ahci }, /* Wellsburg RAID */ { PCI_VDEVICE(INTEL, 0x8d06), board_ahci }, /* Wellsburg RAID */

4
drivers/ata/ata_piix.c
View File

@@ -1547,6 +1547,10 @@ static bool piix_broken_system_poweroff(struct pci_dev *pdev)
static int prefer_ms_hyperv = 1; static int prefer_ms_hyperv = 1;
module_param(prefer_ms_hyperv, int, 0); module_param(prefer_ms_hyperv, int, 0);
MODULE_PARM_DESC(prefer_ms_hyperv,
"Prefer Hyper-V paravirtualization drivers instead of ATA, "
"0 - Use ATA drivers, "
"1 (Default) - Use the paravirtualization drivers.");
static void piix_ignore_devices_quirk(struct ata_host *host) static void piix_ignore_devices_quirk(struct ata_host *host)
{ {

2
drivers/ata/libata-acpi.c
View File

@@ -1027,7 +1027,7 @@ static void ata_acpi_register_power_resource(struct ata_device *dev)
handle = ata_dev_acpi_handle(dev); handle = ata_dev_acpi_handle(dev);
if (handle) if (handle)
acpi_dev_pm_remove_dependent(handle, &sdev->sdev_gendev); acpi_dev_pm_add_dependent(handle, &sdev->sdev_gendev);
} }
static void ata_acpi_unregister_power_resource(struct ata_device *dev) static void ata_acpi_unregister_power_resource(struct ata_device *dev)

13
drivers/ata/pata_samsung_cf.c
View File

@@ -661,18 +661,7 @@ static struct platform_driver pata_s3c_driver = {
}, },
}; };
static int __init pata_s3c_init(void) module_platform_driver_probe(pata_s3c_driver, pata_s3c_probe);
{
return platform_driver_probe(&pata_s3c_driver, pata_s3c_probe);
}
static void __exit pata_s3c_exit(void)
{
platform_driver_unregister(&pata_s3c_driver);
}
module_init(pata_s3c_init);
module_exit(pata_s3c_exit);
MODULE_AUTHOR("Abhilash Kesavan, <a.kesavan@samsung.com>"); MODULE_AUTHOR("Abhilash Kesavan, <a.kesavan@samsung.com>");
MODULE_DESCRIPTION("low-level driver for Samsung PATA controller"); MODULE_DESCRIPTION("low-level driver for Samsung PATA controller");

1
drivers/ata/sata_fsl.c
View File

@@ -1511,7 +1511,6 @@ error_exit_with_cleanup:
if (hcr_base) if (hcr_base)
iounmap(hcr_base); iounmap(hcr_base);
if (host_priv)
kfree(host_priv); kfree(host_priv);
return retval; return retval;