diff options
| author |   Greg Kroah-Hartman <gregkh@google.com> | 2016-09-08 16:06:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2016-09-19 16:43:27 +0200 |
| commit | 148e0b8f48a83008596876befe1d9aed256c8ea1 (patch) | |
| tree | d0c4150e9fba76c8b660e73a0b3fa8e298474f91 /drivers/staging/greybus/spilib.c | |
| parent | staging: greybus: gpio: it's CONFIG_GPIOLIB, not CONFIG_GPIO (diff) | |
| download | linux-dev-148e0b8f48a83008596876befe1d9aed256c8ea1.tar.xz linux-dev-148e0b8f48a83008596876befe1d9aed256c8ea1.zip | |
staging: greybus: spi: remove KERNEL_VERSION checks
No need to support older kernel versions in the Greybus SPI and spilib
driver, so remove the checks as needed, we can now rely on all of the
correct SPI core apis being present.
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/spilib.c')
| -rw-r--r-- | drivers/staging/greybus/spilib.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/greybus/spilib.c b/drivers/staging/greybus/spilib.c index 9427c313dd4e..e97b19148497 100644 --- a/drivers/staging/greybus/spilib.c +++ b/drivers/staging/greybus/spilib.c @@ -456,10 +456,10 @@ static int gb_spi_setup_device(struct gb_spilib *spi, u8 cs) dev_type = response.device_type; if (dev_type == GB_SPI_SPI_DEV) - strlcpy(spi_board.modalias, SPI_DEV_MODALIAS, + strlcpy(spi_board.modalias, "spidev", sizeof(spi_board.modalias)); else if (dev_type == GB_SPI_SPI_NOR) - strlcpy(spi_board.modalias, SPI_NOR_MODALIAS, + strlcpy(spi_board.modalias, "spi-nor", sizeof(spi_board.modalias)); else if (dev_type == GB_SPI_SPI_MODALIAS) memcpy(spi_board.modalias, response.name, @@ -526,9 +526,7 @@ int gb_spilib_master_init(struct gb_connection *connection, struct device *dev, gb_spi_unprepare_transfer_hardware; } -#ifdef SPI_CORE_SUPPORT_PM master->auto_runtime_pm = true; -#endif ret = spi_register_master(master); if (ret < 0) |