Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc8cc677 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull IDE changes from David Miller:
 "Mostly cleanups, and changes part of tree-wide adjustments, this code
  is in deep freeze so that's pretty much what we expect these days"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: sgiioc4: Staticize ioc4_ide_attach_one()
  ide: palm_bk3710: add missing __iomem annotation
  ide: use dev_get_platdata()
  ide-disk_proc: use macro to replace magic number
  ide: replace strict_strtol() with kstrtol()
parents b14662ca 64110c16

drivers/ide/gayle.c

+1 −1
Original line number Diff line number Diff line
@@ -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" : "");

drivers/ide/ide-ioctls.c

+2 −2
Original line number Diff line number Diff line
@@ -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 {

drivers/ide/ide-park.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

drivers/ide/ide_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/ide/palm_bk3710.c

+2 −2
Original line number Diff line number Diff line
@@ -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;



	/*