hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mtd: dataflash: use spi_get_drvdata() and spi_set_drvdata() 

Use the wrapper functions for getting and setting the driver data using
spi_device instead of using dev_{get|set}_drvdata with &spi->dev, so we
can directly pass a struct spi_device.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Jingoo Han 2013-04-06 15:41:03 +09:00 committed by David Woodhouse
parent 1594908ac0
commit 5cacbfa9fe
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mtd/devices/mtd_dataflash.c
View File

@ -661,7 +661,7 @@ static int add_dataflash_otp(struct spi_device *spi, char *name, int nr_pages,
dev_info(&spi->dev, "%s (%lld KBytes) pagesize %d bytes%s\n", dev_info(&spi->dev, "%s (%lld KBytes) pagesize %d bytes%s\n",
name, (long long)((device->size + 1023) >> 10), name, (long long)((device->size + 1023) >> 10),
pagesize, otp_tag); pagesize, otp_tag);
dev_set_drvdata(&spi->dev, priv); spi_set_drvdata(spi, priv);
ppdata.of_node = spi->dev.of_node; ppdata.of_node = spi->dev.of_node;
err = mtd_device_parse_register(device, NULL, &ppdata, err = mtd_device_parse_register(device, NULL, &ppdata,
@ -671,7 +671,7 @@ static int add_dataflash_otp(struct spi_device *spi, char *name, int nr_pages,
if (!err) if (!err)
return 0; return 0;
dev_set_drvdata(&spi->dev, NULL); spi_set_drvdata(spi, NULL);
kfree(priv); kfree(priv);
return err; return err;
} }
@ -895,14 +895,14 @@ static int dataflash_probe(struct spi_device *spi)
static int dataflash_remove(struct spi_device *spi) static int dataflash_remove(struct spi_device *spi)
{ {
struct dataflash *flash = dev_get_drvdata(&spi->dev); struct dataflash *flash = spi_get_drvdata(spi);
int status; int status;
pr_debug("%s: remove\n", dev_name(&spi->dev)); pr_debug("%s: remove\n", dev_name(&spi->dev));
status = mtd_device_unregister(&flash->mtd); status = mtd_device_unregister(&flash->mtd);
if (status == 0) { if (status == 0) {
dev_set_drvdata(&spi->dev, NULL); spi_set_drvdata(spi, NULL);
kfree(flash); kfree(flash);
} }
return status; return status;