Skip to content

Commit

Permalink
mmc: sdhci-pxav2: Drop unused struct sdhci_pxa
Browse files Browse the repository at this point in the history
struct sdhci_pxa is private data of PXA SDHCI driver, but not used in
sdhci-pxav2 at all. Drop unused references to struct sdhci_pxa.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  • Loading branch information
Sebastian Hesselbarth authored and Ulf Hansson committed Nov 10, 2014
1 parent 05e07d8 commit 6a686c3
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions drivers/mmc/host/sdhci-pxav2.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,23 +167,17 @@ static int sdhci_pxav2_probe(struct platform_device *pdev)
struct sdhci_pxa_platdata *pdata = pdev->dev.platform_data;
struct device *dev = &pdev->dev;
struct sdhci_host *host = NULL;
struct sdhci_pxa *pxa = NULL;
const struct of_device_id *match;

int ret;
struct clk *clk;

pxa = kzalloc(sizeof(struct sdhci_pxa), GFP_KERNEL);
if (!pxa)
return -ENOMEM;

host = sdhci_pltfm_init(pdev, NULL, 0);
if (IS_ERR(host)) {
kfree(pxa);
if (IS_ERR(host))
return PTR_ERR(host);
}

pltfm_host = sdhci_priv(host);
pltfm_host->priv = pxa;
pltfm_host->priv = NULL;

clk = clk_get(dev, "PXA-SDHCLK");
if (IS_ERR(clk)) {
Expand Down Expand Up @@ -238,22 +232,19 @@ static int sdhci_pxav2_probe(struct platform_device *pdev)
clk_put(clk);
err_clk_get:
sdhci_pltfm_free(pdev);
kfree(pxa);
return ret;
}

static int sdhci_pxav2_remove(struct platform_device *pdev)
{
struct sdhci_host *host = platform_get_drvdata(pdev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
struct sdhci_pxa *pxa = pltfm_host->priv;

sdhci_remove_host(host, 1);

clk_disable_unprepare(pltfm_host->clk);
clk_put(pltfm_host->clk);
sdhci_pltfm_free(pdev);
kfree(pxa);

return 0;
}
Expand Down

0 comments on commit 6a686c3

Please sign in to comment.