diff --git a/[refs] b/[refs] index 0391aa3c6318..7674887fb85c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c0d2ab069fa668daeda4204580e359dba178169 +refs/heads/master: 1b1ba09c39a7262f322290820ad8f29f964b9eee diff --git a/trunk/drivers/mfd/da9052-spi.c b/trunk/drivers/mfd/da9052-spi.c index 61d63b93576c..0680bcbc53de 100644 --- a/trunk/drivers/mfd/da9052-spi.c +++ b/trunk/drivers/mfd/da9052-spi.c @@ -38,7 +38,7 @@ static int da9052_spi_probe(struct spi_device *spi) da9052->dev = &spi->dev; da9052->chip_irq = spi->irq; - dev_set_drvdata(&spi->dev, da9052); + spi_set_drvdata(spi, da9052); da9052_regmap_config.read_flag_mask = 1; da9052_regmap_config.write_flag_mask = 0; @@ -60,7 +60,7 @@ static int da9052_spi_probe(struct spi_device *spi) static int da9052_spi_remove(struct spi_device *spi) { - struct da9052 *da9052 = dev_get_drvdata(&spi->dev); + struct da9052 *da9052 = spi_get_drvdata(spi); da9052_device_exit(da9052); return 0;