aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/misc/eeprom/eeprom_93xx46.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/eeprom/eeprom_93xx46.c b/drivers/misc/eeprom/eeprom_93xx46.c
index a6b5d5e73485..94cfc1212577 100644
--- a/drivers/misc/eeprom/eeprom_93xx46.c
+++ b/drivers/misc/eeprom/eeprom_93xx46.c
@@ -363,7 +363,7 @@ static int eeprom_93xx46_probe(struct spi_device *spi)
363 dev_err(&spi->dev, "can't create erase interface\n"); 363 dev_err(&spi->dev, "can't create erase interface\n");
364 } 364 }
365 365
366 dev_set_drvdata(&spi->dev, edev); 366 spi_set_drvdata(spi, edev);
367 return 0; 367 return 0;
368fail: 368fail:
369 kfree(edev); 369 kfree(edev);
@@ -372,13 +372,13 @@ fail:
372 372
373static int eeprom_93xx46_remove(struct spi_device *spi) 373static int eeprom_93xx46_remove(struct spi_device *spi)
374{ 374{
375 struct eeprom_93xx46_dev *edev = dev_get_drvdata(&spi->dev); 375 struct eeprom_93xx46_dev *edev = spi_get_drvdata(spi);
376 376
377 if (!(edev->pdata->flags & EE_READONLY)) 377 if (!(edev->pdata->flags & EE_READONLY))
378 device_remove_file(&spi->dev, &dev_attr_erase); 378 device_remove_file(&spi->dev, &dev_attr_erase);
379 379
380 sysfs_remove_bin_file(&spi->dev.kobj, &edev->bin); 380 sysfs_remove_bin_file(&spi->dev.kobj, &edev->bin);
381 dev_set_drvdata(&spi->dev, NULL); 381 spi_set_drvdata(spi, NULL);
382 kfree(edev); 382 kfree(edev);
383 return 0; 383 return 0;
384} 384}