Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 15:58:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

Browse Source 
Pull libata updates from Tejun Heo:
 "Nothing interesting.  A couple device specific minor updates and a
  kernel doc change"

* 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ata: pata_arasam_cf: Use devm_clk_get
  libata: fix libata-core.c kernel-doc warning
  ata: sata_rcar: Remove obsolete sata-r8a779* platform_device_id entries
This commit is contained in:
Linus Torvalds 2015-09-02 08:00:54 -07:00
commit 2dc7e555e3
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/ata/libata-core.c
View File

@ -4753,6 +4753,7 @@ void swap_buf_le16(u16 *buf, unsigned int buf_words)
/** /**
* ata_qc_new_init - Request an available ATA command, and initialize it * ata_qc_new_init - Request an available ATA command, and initialize it
* @dev: Device from whom we request an available command structure * @dev: Device from whom we request an available command structure
* @tag: tag
* *
* LOCKING: * LOCKING:
* None. * None.

11
drivers/ata/pata_arasan_cf.c
View File

@ -834,7 +834,7 @@ static int arasan_cf_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
} }
acdev->clk = clk_get(&pdev->dev, NULL); acdev->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(acdev->clk)) { if (IS_ERR(acdev->clk)) {
dev_warn(&pdev->dev, "Clock not found\n"); dev_warn(&pdev->dev, "Clock not found\n");
return PTR_ERR(acdev->clk); return PTR_ERR(acdev->clk);
@ -843,9 +843,8 @@ static int arasan_cf_probe(struct platform_device *pdev)
/* allocate host */ /* allocate host */
host = ata_host_alloc(&pdev->dev, 1); host = ata_host_alloc(&pdev->dev, 1);
if (!host) { if (!host) {
ret = -ENOMEM;
dev_warn(&pdev->dev, "alloc host fail\n"); dev_warn(&pdev->dev, "alloc host fail\n");
goto free_clk; return -ENOMEM;
} }
ap = host->ports[0]; ap = host->ports[0];
@ -894,7 +893,7 @@ static int arasan_cf_probe(struct platform_device *pdev)
ret = cf_init(acdev); ret = cf_init(acdev);
if (ret) if (ret)
goto free_clk; return ret;
cf_card_detect(acdev, 0); cf_card_detect(acdev, 0);
@ -904,8 +903,7 @@ static int arasan_cf_probe(struct platform_device *pdev)
return 0; return 0;
cf_exit(acdev); cf_exit(acdev);
free_clk:
clk_put(acdev->clk);
return ret; return ret;
} }
@ -916,7 +914,6 @@ static int arasan_cf_remove(struct platform_device *pdev)
ata_host_detach(host); ata_host_detach(host);
cf_exit(acdev); cf_exit(acdev);
clk_put(acdev->clk);
return 0; return 0;
} }

4
drivers/ata/sata_rcar.c
View File

@ -861,10 +861,6 @@ MODULE_DEVICE_TABLE(of, sata_rcar_match);
static const struct platform_device_id sata_rcar_id_table[] = { static const struct platform_device_id sata_rcar_id_table[] = {
{ "sata_rcar", RCAR_GEN1_SATA }, /* Deprecated by "sata-r8a7779" */ { "sata_rcar", RCAR_GEN1_SATA }, /* Deprecated by "sata-r8a7779" */
{ "sata-r8a7779", RCAR_GEN1_SATA }, { "sata-r8a7779", RCAR_GEN1_SATA },
{ "sata-r8a7790", RCAR_GEN2_SATA },
{ "sata-r8a7790-es1", RCAR_R8A7790_ES1_SATA },
{ "sata-r8a7791", RCAR_GEN2_SATA },
{ "sata-r8a7793", RCAR_GEN2_SATA },
{ }, { },
}; };
MODULE_DEVICE_TABLE(platform, sata_rcar_id_table); MODULE_DEVICE_TABLE(platform, sata_rcar_id_table);