Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[cascardo/linux.git] / drivers / hwmon / ad7314.c

diff --git a/drivers/hwmon/ad7314.c b/drivers/hwmon/ad7314.c
index a57584d..f4f9b21 100644 (file)
--- a/drivers/hwmon/ad7314.c
+++ b/drivers/hwmon/ad7314.c
@@ -116,7 +116,7 @@ static int ad7314_probe(struct spi_device *spi_dev)
        if (chip == NULL)
                return -ENOMEM;
 
-       dev_set_drvdata(&spi_dev->dev, chip);
+       spi_set_drvdata(spi_dev, chip);
 
        ret = sysfs_create_group(&spi_dev->dev.kobj, &ad7314_group);
        if (ret < 0)
@@ -137,7 +137,7 @@ error_remove_group:
 
 static int ad7314_remove(struct spi_device *spi_dev)
 {
-       struct ad7314_data *chip = dev_get_drvdata(&spi_dev->dev);
+       struct ad7314_data *chip = spi_get_drvdata(spi_dev);
 
        hwmon_device_unregister(chip->hwmon_dev);
        sysfs_remove_group(&spi_dev->dev.kobj, &ad7314_group);
@@ -166,6 +166,5 @@ static struct spi_driver ad7314_driver = {
 module_spi_driver(ad7314_driver);
 
 MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>");
-MODULE_DESCRIPTION("Analog Devices AD7314, ADT7301 and ADT7302 digital"
-                       " temperature sensor driver");
+MODULE_DESCRIPTION("Analog Devices AD7314, ADT7301 and ADT7302 digital temperature sensor driver");
 MODULE_LICENSE("GPL v2");