diff options
-rw-r--r-- | drivers/spi/spi-nuc900.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/spi/spi-nuc900.c b/drivers/spi/spi-nuc900.c index 50406306bc20..6d36c35c86f5 100644 --- a/drivers/spi/spi-nuc900.c +++ b/drivers/spi/spi-nuc900.c | |||
@@ -58,11 +58,8 @@ struct nuc900_spi { | |||
58 | unsigned char *rx; | 58 | unsigned char *rx; |
59 | struct clk *clk; | 59 | struct clk *clk; |
60 | struct spi_master *master; | 60 | struct spi_master *master; |
61 | struct spi_device *curdev; | ||
62 | struct device *dev; | ||
63 | struct nuc900_spi_info *pdata; | 61 | struct nuc900_spi_info *pdata; |
64 | spinlock_t lock; | 62 | spinlock_t lock; |
65 | struct resource *res; | ||
66 | }; | 63 | }; |
67 | 64 | ||
68 | static inline struct nuc900_spi *to_hw(struct spi_device *sdev) | 65 | static inline struct nuc900_spi *to_hw(struct spi_device *sdev) |
@@ -338,6 +335,7 @@ static int nuc900_spi_probe(struct platform_device *pdev) | |||
338 | { | 335 | { |
339 | struct nuc900_spi *hw; | 336 | struct nuc900_spi *hw; |
340 | struct spi_master *master; | 337 | struct spi_master *master; |
338 | struct resource *res; | ||
341 | int err = 0; | 339 | int err = 0; |
342 | 340 | ||
343 | master = spi_alloc_master(&pdev->dev, sizeof(struct nuc900_spi)); | 341 | master = spi_alloc_master(&pdev->dev, sizeof(struct nuc900_spi)); |
@@ -349,7 +347,6 @@ static int nuc900_spi_probe(struct platform_device *pdev) | |||
349 | hw = spi_master_get_devdata(master); | 347 | hw = spi_master_get_devdata(master); |
350 | hw->master = master; | 348 | hw->master = master; |
351 | hw->pdata = dev_get_platdata(&pdev->dev); | 349 | hw->pdata = dev_get_platdata(&pdev->dev); |
352 | hw->dev = &pdev->dev; | ||
353 | 350 | ||
354 | if (hw->pdata == NULL) { | 351 | if (hw->pdata == NULL) { |
355 | dev_err(&pdev->dev, "No platform data supplied\n"); | 352 | dev_err(&pdev->dev, "No platform data supplied\n"); |
@@ -367,8 +364,8 @@ static int nuc900_spi_probe(struct platform_device *pdev) | |||
367 | hw->bitbang.chipselect = nuc900_spi_chipsel; | 364 | hw->bitbang.chipselect = nuc900_spi_chipsel; |
368 | hw->bitbang.txrx_bufs = nuc900_spi_txrx; | 365 | hw->bitbang.txrx_bufs = nuc900_spi_txrx; |
369 | 366 | ||
370 | hw->res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 367 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
371 | hw->regs = devm_ioremap_resource(&pdev->dev, hw->res); | 368 | hw->regs = devm_ioremap_resource(&pdev->dev, res); |
372 | if (IS_ERR(hw->regs)) { | 369 | if (IS_ERR(hw->regs)) { |
373 | err = PTR_ERR(hw->regs); | 370 | err = PTR_ERR(hw->regs); |
374 | goto err_pdata; | 371 | goto err_pdata; |