diff options
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/gayle.c | 2 | ||||
| -rw-r--r-- | drivers/ide/ide-acpi.c | 5 | ||||
| -rw-r--r-- | drivers/ide/ide-ioctls.c | 4 | ||||
| -rw-r--r-- | drivers/ide/ide-park.c | 6 | ||||
| -rw-r--r-- | drivers/ide/ide_platform.c | 2 | ||||
| -rw-r--r-- | drivers/ide/palm_bk3710.c | 4 | ||||
| -rw-r--r-- | drivers/ide/sgiioc4.c | 2 | ||||
| -rw-r--r-- | drivers/ide/tx4938ide.c | 4 |
8 files changed, 16 insertions, 13 deletions
diff --git a/drivers/ide/gayle.c b/drivers/ide/gayle.c index 0a8440ae0565..97a2f9dc75d8 100644 --- a/drivers/ide/gayle.c +++ b/drivers/ide/gayle.c @@ -132,7 +132,7 @@ static int __init amiga_gayle_ide_probe(struct platform_device *pdev) if (!request_mem_region(res->start, resource_size(res), "IDE")) return -EBUSY; - pdata = pdev->dev.platform_data; + pdata = dev_get_platdata(&pdev->dev); pr_info("ide: Gayle IDE controller (A%u style%s)\n", pdata->explicit_ack ? 1200 : 4000, ide_doubler ? ", IDE doubler" : ""); diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index f1a6796b165c..140c8ef50529 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c @@ -520,11 +520,12 @@ void ide_acpi_set_state(ide_hwif_t *hwif, int on) ide_port_for_each_present_dev(i, drive, hwif) { if (drive->acpidata->obj_handle) acpi_bus_set_power(drive->acpidata->obj_handle, - on ? ACPI_STATE_D0 : ACPI_STATE_D3); + on ? ACPI_STATE_D0 : ACPI_STATE_D3_COLD); } if (!on) - acpi_bus_set_power(hwif->acpidata->obj_handle, ACPI_STATE_D3); + acpi_bus_set_power(hwif->acpidata->obj_handle, + ACPI_STATE_D3_COLD); } /** diff --git a/drivers/ide/ide-ioctls.c b/drivers/ide/ide-ioctls.c index 4d19eb9772a1..6233fa2cb8a9 100644 --- a/drivers/ide/ide-ioctls.c +++ b/drivers/ide/ide-ioctls.c @@ -141,8 +141,8 @@ static int ide_cmd_ioctl(ide_drive_t *drive, unsigned long arg) if (args[0] == ATA_CMD_SMART) { tf->nsect = args[3]; tf->lbal = args[1]; - tf->lbam = 0x4f; - tf->lbah = 0xc2; + tf->lbam = ATA_SMART_LBAM_PASS; + tf->lbah = ATA_SMART_LBAH_PASS; cmd.valid.out.tf = IDE_VALID_OUT_TF; cmd.valid.in.tf = IDE_VALID_NSECT; } else { diff --git a/drivers/ide/ide-park.c b/drivers/ide/ide-park.c index 6ab9ab2a5081..f41558a0bcd1 100644 --- a/drivers/ide/ide-park.c +++ b/drivers/ide/ide-park.c @@ -116,8 +116,10 @@ ssize_t ide_park_store(struct device *dev, struct device_attribute *attr, long int input; int rc; - rc = strict_strtol(buf, 10, &input); - if (rc || input < -2) + rc = kstrtol(buf, 10, &input); + if (rc) + return rc; + if (input < -2) return -EINVAL; if (input > MAX_PARK_TIMEOUT) { input = MAX_PARK_TIMEOUT; diff --git a/drivers/ide/ide_platform.c b/drivers/ide/ide_platform.c index ba4bfbead24b..a8b4b6af80e7 100644 --- a/drivers/ide/ide_platform.c +++ b/drivers/ide/ide_platform.c @@ -56,7 +56,7 @@ static int plat_ide_probe(struct platform_device *pdev) struct ide_hw hw, *hws[] = { &hw }; struct ide_port_info d = platform_ide_port_info; - pdata = pdev->dev.platform_data; + pdata = dev_get_platdata(&pdev->dev); /* get a pointer to the register memory */ res_base = platform_get_resource(pdev, IORESOURCE_IO, 0); diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.c index 6107cc4ee012..ba20d18c0373 100644 --- a/drivers/ide/palm_bk3710.c +++ b/drivers/ide/palm_bk3710.c @@ -191,7 +191,7 @@ static void palm_bk3710_setpiomode(void __iomem *base, ide_drive_t *mate, static void palm_bk3710_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive) { int is_slave = drive->dn & 1; - void __iomem *base = (void *)hwif->dma_base; + void __iomem *base = (void __iomem *)hwif->dma_base; const u8 xferspeed = drive->dma_mode; if (xferspeed >= XFER_UDMA_0) { @@ -209,7 +209,7 @@ static void palm_bk3710_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) unsigned int cycle_time; int is_slave = drive->dn & 1; ide_drive_t *mate; - void __iomem *base = (void *)hwif->dma_base; + void __iomem *base = (void __iomem *)hwif->dma_base; const u8 pio = drive->pio_mode - XFER_PIO_0; /* diff --git a/drivers/ide/sgiioc4.c b/drivers/ide/sgiioc4.c index a5ca179a83b3..63761db61384 100644 --- a/drivers/ide/sgiioc4.c +++ b/drivers/ide/sgiioc4.c @@ -600,7 +600,7 @@ out: return ret; } -int ioc4_ide_attach_one(struct ioc4_driver_data *idd) +static int ioc4_ide_attach_one(struct ioc4_driver_data *idd) { /* * PCI-RT does not bring out IDE connection. diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c index ede8575ac7d5..68edd4f58a28 100644 --- a/drivers/ide/tx4938ide.c +++ b/drivers/ide/tx4938ide.c @@ -58,7 +58,7 @@ static void tx4938ide_tune_ebusc(unsigned int ebus_ch, static void tx4938ide_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) { - struct tx4938ide_platform_info *pdata = hwif->dev->platform_data; + struct tx4938ide_platform_info *pdata = dev_get_platdata(hwif->dev); u8 safe = drive->pio_mode - XFER_PIO_0; ide_drive_t *pair; @@ -132,7 +132,7 @@ static int __init tx4938ide_probe(struct platform_device *pdev) struct ide_hw hw, *hws[] = { &hw }; struct ide_host *host; struct resource *res; - struct tx4938ide_platform_info *pdata = pdev->dev.platform_data; + struct tx4938ide_platform_info *pdata = dev_get_platdata(&pdev->dev); int irq, ret, i; unsigned long mapbase, mapctl; struct ide_port_info d = tx4938ide_port_info; |