Commit 159a8b46 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Ulf Hansson

mmc: sdhci-cadence: use struct_size() helper

One of the more common cases of allocation size calculations is finding
the size of a structure that has a zero-sized array at the end, along
with memory for some number of elements for that array. For example:

struct sdhci_cdns_priv {
	...
        struct sdhci_cdns_phy_param phy_params[0];
};

Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes.

So, replace the following form:

sizeof(*priv) + sizeof(priv->phy_params[0]) * nr_phy_params

with:

struct_size(priv, phy_params, nr_phy_params)

Also, notice that, in this case, variable priv_size is not necessary,
hence it is removed.

This code was detected with the help of Coccinelle.
Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 5f3ad196
...@@ -337,7 +337,6 @@ static int sdhci_cdns_probe(struct platform_device *pdev) ...@@ -337,7 +337,6 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
struct sdhci_pltfm_host *pltfm_host; struct sdhci_pltfm_host *pltfm_host;
struct sdhci_cdns_priv *priv; struct sdhci_cdns_priv *priv;
struct clk *clk; struct clk *clk;
size_t priv_size;
unsigned int nr_phy_params; unsigned int nr_phy_params;
int ret; int ret;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
...@@ -351,8 +350,8 @@ static int sdhci_cdns_probe(struct platform_device *pdev) ...@@ -351,8 +350,8 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
return ret; return ret;
nr_phy_params = sdhci_cdns_phy_param_count(dev->of_node); nr_phy_params = sdhci_cdns_phy_param_count(dev->of_node);
priv_size = sizeof(*priv) + sizeof(priv->phy_params[0]) * nr_phy_params; host = sdhci_pltfm_init(pdev, &sdhci_cdns_pltfm_data,
host = sdhci_pltfm_init(pdev, &sdhci_cdns_pltfm_data, priv_size); struct_size(priv, phy_params, nr_phy_params));
if (IS_ERR(host)) { if (IS_ERR(host)) {
ret = PTR_ERR(host); ret = PTR_ERR(host);
goto disable_clk; goto disable_clk;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment