diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-01-21 11:24:48 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-01-21 11:24:48 -0500 |
commit | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (patch) | |
tree | 0bba0d79151fc7fab5feb6f9507ec9748b2ba587 /drivers/spi | |
parent | c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470 (diff) |
driver-core: remove conditionals around devicetree pointers
Having conditional around the of_match_table and the of_node pointers
turns out to make driver code use ugly #ifdef blocks. Drop the
conditionals and remove the #ifdef blocks from the affected drivers.
Also tidy up minor whitespace issues within the same hunks.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/pxa2xx_spi.c | 2 | ||||
-rw-r--r-- | drivers/spi/pxa2xx_spi_pci.c | 2 | ||||
-rw-r--r-- | drivers/spi/xilinx_spi.c | 6 |
3 files changed, 0 insertions, 10 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index 95928833855b..a429b01d0285 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c | |||
@@ -1557,9 +1557,7 @@ static int __devinit pxa2xx_spi_probe(struct platform_device *pdev) | |||
1557 | drv_data->ssp = ssp; | 1557 | drv_data->ssp = ssp; |
1558 | 1558 | ||
1559 | master->dev.parent = &pdev->dev; | 1559 | master->dev.parent = &pdev->dev; |
1560 | #ifdef CONFIG_OF | ||
1561 | master->dev.of_node = pdev->dev.of_node; | 1560 | master->dev.of_node = pdev->dev.of_node; |
1562 | #endif | ||
1563 | /* the spi->mode bits understood by this driver: */ | 1561 | /* the spi->mode bits understood by this driver: */ |
1564 | master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; | 1562 | master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; |
1565 | 1563 | ||
diff --git a/drivers/spi/pxa2xx_spi_pci.c b/drivers/spi/pxa2xx_spi_pci.c index 351d8a375b57..b6589bb3a6c3 100644 --- a/drivers/spi/pxa2xx_spi_pci.c +++ b/drivers/spi/pxa2xx_spi_pci.c | |||
@@ -98,9 +98,7 @@ static int __devinit ce4100_spi_probe(struct pci_dev *dev, | |||
98 | pdev->dev.parent = &dev->dev; | 98 | pdev->dev.parent = &dev->dev; |
99 | pdev->dev.platform_data = &spi_info->spi_pdata; | 99 | pdev->dev.platform_data = &spi_info->spi_pdata; |
100 | 100 | ||
101 | #ifdef CONFIG_OF | ||
102 | pdev->dev.of_node = dev->dev.of_node; | 101 | pdev->dev.of_node = dev->dev.of_node; |
103 | #endif | ||
104 | pdev->dev.release = plat_dev_release; | 102 | pdev->dev.release = plat_dev_release; |
105 | 103 | ||
106 | spi_pdata->num_chipselect = dev->devfn; | 104 | spi_pdata->num_chipselect = dev->devfn; |
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c index 7adaef62a991..4d2c75df886c 100644 --- a/drivers/spi/xilinx_spi.c +++ b/drivers/spi/xilinx_spi.c | |||
@@ -351,14 +351,12 @@ static irqreturn_t xilinx_spi_irq(int irq, void *dev_id) | |||
351 | return IRQ_HANDLED; | 351 | return IRQ_HANDLED; |
352 | } | 352 | } |
353 | 353 | ||
354 | #ifdef CONFIG_OF | ||
355 | static const struct of_device_id xilinx_spi_of_match[] = { | 354 | static const struct of_device_id xilinx_spi_of_match[] = { |
356 | { .compatible = "xlnx,xps-spi-2.00.a", }, | 355 | { .compatible = "xlnx,xps-spi-2.00.a", }, |
357 | { .compatible = "xlnx,xps-spi-2.00.b", }, | 356 | { .compatible = "xlnx,xps-spi-2.00.b", }, |
358 | {} | 357 | {} |
359 | }; | 358 | }; |
360 | MODULE_DEVICE_TABLE(of, xilinx_spi_of_match); | 359 | MODULE_DEVICE_TABLE(of, xilinx_spi_of_match); |
361 | #endif | ||
362 | 360 | ||
363 | struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem, | 361 | struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem, |
364 | u32 irq, s16 bus_num, int num_cs, int little_endian, int bits_per_word) | 362 | u32 irq, s16 bus_num, int num_cs, int little_endian, int bits_per_word) |
@@ -394,9 +392,7 @@ struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem, | |||
394 | 392 | ||
395 | master->bus_num = bus_num; | 393 | master->bus_num = bus_num; |
396 | master->num_chipselect = num_cs; | 394 | master->num_chipselect = num_cs; |
397 | #ifdef CONFIG_OF | ||
398 | master->dev.of_node = dev->of_node; | 395 | master->dev.of_node = dev->of_node; |
399 | #endif | ||
400 | 396 | ||
401 | xspi->mem = *mem; | 397 | xspi->mem = *mem; |
402 | xspi->irq = irq; | 398 | xspi->irq = irq; |
@@ -539,9 +535,7 @@ static struct platform_driver xilinx_spi_driver = { | |||
539 | .driver = { | 535 | .driver = { |
540 | .name = XILINX_SPI_NAME, | 536 | .name = XILINX_SPI_NAME, |
541 | .owner = THIS_MODULE, | 537 | .owner = THIS_MODULE, |
542 | #ifdef CONFIG_OF | ||
543 | .of_match_table = xilinx_spi_of_match, | 538 | .of_match_table = xilinx_spi_of_match, |
544 | #endif | ||
545 | }, | 539 | }, |
546 | }; | 540 | }; |
547 | 541 | ||