From fb11e0cf7167f0e092755730d5cc01d14cd9e856 Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Sat, 6 Apr 2013 15:43:23 +0900 Subject: [PATCH] --- yaml --- r: 373239 b: refs/heads/master c: 1b1ba09c39a7262f322290820ad8f29f964b9eee h: refs/heads/master i: 373237: be9fb361af21c5ef7ddf3c485d936cffb9a39f27 373235: 7fb6291e84a6926d654e28ed4da804431c96f146 373231: 82760ffb25a2bb02335faffa6afc0fd575dae1c0 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/da9052-spi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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;