Re: [PATCH v2 4/4] staging:iio:ad5933: Remove platform data from state struct

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 25/09/14 15:27, Lars-Peter Clausen wrote:
> The platform data is only used in the probe function. No need to keep it
> around.
> 
> Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Applied.
> ---
> No changes since v1
> ---
>  drivers/staging/iio/impedance-analyzer/ad5933.c | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
> index 95b17c5..3c5d917 100644
> --- a/drivers/staging/iio/impedance-analyzer/ad5933.c
> +++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
> @@ -89,7 +89,6 @@
>  struct ad5933_state {
>  	struct i2c_client		*client;
>  	struct regulator		*reg;
> -	struct ad5933_platform_data	*pdata;
>  	struct delayed_work		work;
>  	unsigned long			mclk_hz;
>  	unsigned char			ctrl_hb;
> @@ -712,9 +711,7 @@ static int ad5933_probe(struct i2c_client *client,
>  	st->client = client;
>  
>  	if (!pdata)
> -		st->pdata = &ad5933_default_pdata;
> -	else
> -		st->pdata = pdata;
> +		pdata = &ad5933_default_pdata;
>  
>  	st->reg = devm_regulator_get(&client->dev, "vcc");
>  	if (!IS_ERR(st->reg)) {
> @@ -727,10 +724,10 @@ static int ad5933_probe(struct i2c_client *client,
>  	if (voltage_uv)
>  		st->vref_mv = voltage_uv / 1000;
>  	else
> -		st->vref_mv = st->pdata->vref_mv;
> +		st->vref_mv = pdata->vref_mv;
>  
> -	if (st->pdata->ext_clk_Hz) {
> -		st->mclk_hz = st->pdata->ext_clk_Hz;
> +	if (pdata->ext_clk_Hz) {
> +		st->mclk_hz = pdata->ext_clk_Hz;
>  		st->ctrl_lb = AD5933_CTRL_EXT_SYSCLK;
>  	} else {
>  		st->mclk_hz = AD5933_INT_OSC_FREQ_Hz;
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Input]     [Linux Kernel]     [Linux SCSI]     [X.org]

  Powered by Linux