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/mmc | |
| 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/mmc')
| -rw-r--r-- | drivers/mmc/host/mmc_spi.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index fd877f633dd2..2f7fc0c5146f 100644 --- a/drivers/mmc/host/mmc_spi.c +++ b/drivers/mmc/host/mmc_spi.c | |||
| @@ -1516,21 +1516,17 @@ static int __devexit mmc_spi_remove(struct spi_device *spi) | |||
| 1516 | return 0; | 1516 | return 0; |
| 1517 | } | 1517 | } |
| 1518 | 1518 | ||
| 1519 | #if defined(CONFIG_OF) | ||
| 1520 | static struct of_device_id mmc_spi_of_match_table[] __devinitdata = { | 1519 | static struct of_device_id mmc_spi_of_match_table[] __devinitdata = { |
| 1521 | { .compatible = "mmc-spi-slot", }, | 1520 | { .compatible = "mmc-spi-slot", }, |
| 1522 | {}, | 1521 | {}, |
| 1523 | }; | 1522 | }; |
| 1524 | #endif | ||
| 1525 | 1523 | ||
| 1526 | static struct spi_driver mmc_spi_driver = { | 1524 | static struct spi_driver mmc_spi_driver = { |
| 1527 | .driver = { | 1525 | .driver = { |
| 1528 | .name = "mmc_spi", | 1526 | .name = "mmc_spi", |
| 1529 | .bus = &spi_bus_type, | 1527 | .bus = &spi_bus_type, |
| 1530 | .owner = THIS_MODULE, | 1528 | .owner = THIS_MODULE, |
| 1531 | #if defined(CONFIG_OF) | ||
| 1532 | .of_match_table = mmc_spi_of_match_table, | 1529 | .of_match_table = mmc_spi_of_match_table, |
| 1533 | #endif | ||
| 1534 | }, | 1530 | }, |
| 1535 | .probe = mmc_spi_probe, | 1531 | .probe = mmc_spi_probe, |
| 1536 | .remove = __devexit_p(mmc_spi_remove), | 1532 | .remove = __devexit_p(mmc_spi_remove), |