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

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

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 790e0deb278e5eb30a44bc0807a7fdd862707078..b79cb10e289e8a1eb52c2887b3e7c135952beb0f 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -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
  *     @dev: Device from whom we request an available command structure
+ *     @tag: tag
  *
  *     LOCKING:
  *     None.

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

diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c
index d49a5193b7de9e9438ef0f6693ca53db757e5027..8804127b108c0f8e613f2583968f6b661a46be84 100644 (file)
--- a/drivers/ata/sata_rcar.c
+++ b/drivers/ata/sata_rcar.c
@@ -861,10 +861,6 @@ MODULE_DEVICE_TABLE(of, sata_rcar_match);
 static const struct platform_device_id sata_rcar_id_table[] = {
        { "sata_rcar", RCAR_GEN1_SATA }, /* Deprecated by "sata-r8a7779" */
        { "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);