aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-04-05 16:37:07 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-07 16:48:19 -0400
commit5d5f18460f451d5d06f2f788c90cfccd6631139a (patch)
treef3e4b845570eaca5244547bd7cc70f6f9ea1359a /drivers/net
parentd60c5d205094218bf7e6277ee9f8ddf90f8c1624 (diff)
net: phy: spi_ks8995: 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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/phy/spi_ks8995.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c
index 5c87eef40bf9..d11c93e69e03 100644
--- a/drivers/net/phy/spi_ks8995.c
+++ b/drivers/net/phy/spi_ks8995.c
@@ -281,7 +281,7 @@ static int ks8995_probe(struct spi_device *spi)
281 mutex_init(&ks->lock); 281 mutex_init(&ks->lock);
282 ks->pdata = pdata; 282 ks->pdata = pdata;
283 ks->spi = spi_dev_get(spi); 283 ks->spi = spi_dev_get(spi);
284 dev_set_drvdata(&spi->dev, ks); 284 spi_set_drvdata(spi, ks);
285 285
286 spi->mode = SPI_MODE_0; 286 spi->mode = SPI_MODE_0;
287 spi->bits_per_word = 8; 287 spi->bits_per_word = 8;
@@ -325,7 +325,7 @@ static int ks8995_probe(struct spi_device *spi)
325 return 0; 325 return 0;
326 326
327err_drvdata: 327err_drvdata:
328 dev_set_drvdata(&spi->dev, NULL); 328 spi_set_drvdata(spi, NULL);
329 kfree(ks); 329 kfree(ks);
330 return err; 330 return err;
331} 331}
@@ -334,10 +334,10 @@ static int ks8995_remove(struct spi_device *spi)
334{ 334{
335 struct ks8995_data *ks8995; 335 struct ks8995_data *ks8995;
336 336
337 ks8995 = dev_get_drvdata(&spi->dev); 337 ks8995 = spi_get_drvdata(spi);
338 sysfs_remove_bin_file(&spi->dev.kobj, &ks8995_registers_attr); 338 sysfs_remove_bin_file(&spi->dev.kobj, &ks8995_registers_attr);
339 339
340 dev_set_drvdata(&spi->dev, NULL); 340 spi_set_drvdata(spi, NULL);
341 kfree(ks8995); 341 kfree(ks8995);
342 342
343 return 0; 343 return 0;