linux/drivers/ide, branch v3.12.15

ide: sgiioc4: Staticize ioc4_ide_attach_one()

2013-09-05T19:21:30Z

ioc4_ide_attach_one() is used only in this file. Fix the following sparse warnings: drivers/ide/sgiioc4.c:603:5: warning: symbol 'ioc4_ide_attach_one' was not declared. Should it be static? Signed-off-by: Jingoo Han Signed-off-by: David S. Miller

ide: palm_bk3710: add missing __iomem annotation

2013-09-05T19:21:29Z

Added missing __iomem annotation in order to fix the following sparse warnings: drivers/ide/palm_bk3710.c:194:31: warning: incorrect type in initializer (different address spaces) drivers/ide/palm_bk3710.c:194:31: expected void [noderef] *base drivers/ide/palm_bk3710.c:194:31: got void * drivers/ide/palm_bk3710.c:212:31: warning: incorrect type in initializer (different address spaces) drivers/ide/palm_bk3710.c:212:31: expected void [noderef] *base drivers/ide/palm_bk3710.c:212:31: got void * Signed-off-by: Jingoo Han Signed-off-by: David S. Miller

ide: use dev_get_platdata()

2013-09-05T19:21:29Z

Use the wrapper function for retrieving the platform data instead of accessing dev->platform_data directly. Signed-off-by: Jingoo Han Signed-off-by: David S. Miller

ide-disk_proc: use macro to replace magic number

2013-09-05T19:21:29Z

Signed-off-by: Xinghai Yu Signed-off-by: David S. Miller

ide: replace strict_strtol() with kstrtol()

2013-09-05T19:21:29Z

The usage of strict_strtol() is not preferred, because strict_strtol() is obsolete. Thus, kstrtol() should be used. Signed-off-by: Jingoo Han Signed-off-by: David S. Miller

ACPI / PM: Use ACPI_STATE_D3_COLD instead of ACPI_STATE_D3 everywhere

2013-07-30T12:36:20Z

There are several places in the tree where ACPI_STATE_D3 is used instead of ACPI_STATE_D3_COLD which should be used instead for clarity. Modify them all to use ACPI_STATE_D3_COLD as appropriate. [The definition of ACPI_STATE_D3 itself cannot go away at this point as it is part of ACPICA.] Signed-off-by: Rafael J. Wysocki Reviewed-by: Aaron Lu

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

2013-07-11T01:15:41Z

Pull IDE updates from David Miller: "Just a few small things: 1) module_platform_driver_probe() conversions from Jingoo Han. 2) module_pci_driver() conversion from Libo Chen. 3) PIO size calculation fix from Steven J Hill" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide: ide: Fix IDE PIO size calculation drivers/ide/delkin_cb: Convert to module_pci_driver ide: gayle: use module_platform_driver_probe() ide: tx4939ide: use module_platform_driver_probe() ide: tx4938ide: use module_platform_driver_probe()

ide: Fix IDE PIO size calculation

2013-07-10T19:09:10Z

IDE PIO calculates the size wrong when passing the parameter "ide-core.nodma=0.0" to the kernel. Signed-off-by: Leonid Yegoshin Acked-by: Steven J. Hill Signed-off-by: Steven J. Hill Signed-off-by: David S. Miller

drivers/ide/delkin_cb: Convert to module_pci_driver

2013-07-10T19:09:10Z

use module_pci_driver instead of init/exit, make code clean. Signed-off-by: Libo Chen Signed-off-by: David S. Miller

drivers: avoid format string in dev_set_name

2013-07-03T23:07:41Z

Calling dev_set_name with a single paramter causes it to be handled as a format string. Many callers are passing potentially dynamic string content, so use "%s" in those cases to avoid any potential accidents, including wrappers like device_create*() and bdi_register(). Signed-off-by: Kees Cook Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds