diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2013-03-11 13:44:52 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-18 19:29:29 -0400 |
commit | 91debb0383d6564e0dc8ae76181f6daf8e24717a (patch) | |
tree | f82258268410dcf6a64aa09880c54c96520e9904 /drivers/tty | |
parent | c2ee91bd6644324160ba9e090e3a017d62abc0b4 (diff) |
tty: ifx6x60: Remove unused suspend/resume callbacks
The ifx6x60 driver implements both legacy suspend/resume callbacks and
dev_pm_ops. The SPI core is going to ignore legacy suspend/resume
callbacks if a driver implements dev_pm_ops. Since the legacy suspend/resume
callbacks are empty in this case it is safe to just remove them.
Cc: Bi Chao <chao.bi@intel.com>
Cc: Chen Jun <jun.d.chen@intel.com>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/ifx6x60.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c index 2c77fed31a72..8b1534c424af 100644 --- a/drivers/tty/serial/ifx6x60.c +++ b/drivers/tty/serial/ifx6x60.c | |||
@@ -1279,30 +1279,6 @@ static void ifx_spi_spi_shutdown(struct spi_device *spi) | |||
1279 | */ | 1279 | */ |
1280 | 1280 | ||
1281 | /** | 1281 | /** |
1282 | * ifx_spi_spi_suspend - suspend SPI on system suspend | ||
1283 | * @dev: device being suspended | ||
1284 | * | ||
1285 | * Suspend the SPI side. No action needed on Intel MID platforms, may | ||
1286 | * need extending for other systems. | ||
1287 | */ | ||
1288 | static int ifx_spi_spi_suspend(struct spi_device *spi, pm_message_t msg) | ||
1289 | { | ||
1290 | return 0; | ||
1291 | } | ||
1292 | |||
1293 | /** | ||
1294 | * ifx_spi_spi_resume - resume SPI side on system resume | ||
1295 | * @dev: device being suspended | ||
1296 | * | ||
1297 | * Suspend the SPI side. No action needed on Intel MID platforms, may | ||
1298 | * need extending for other systems. | ||
1299 | */ | ||
1300 | static int ifx_spi_spi_resume(struct spi_device *spi) | ||
1301 | { | ||
1302 | return 0; | ||
1303 | } | ||
1304 | |||
1305 | /** | ||
1306 | * ifx_spi_pm_suspend - suspend modem on system suspend | 1282 | * ifx_spi_pm_suspend - suspend modem on system suspend |
1307 | * @dev: device being suspended | 1283 | * @dev: device being suspended |
1308 | * | 1284 | * |
@@ -1391,8 +1367,6 @@ static struct spi_driver ifx_spi_driver = { | |||
1391 | .probe = ifx_spi_spi_probe, | 1367 | .probe = ifx_spi_spi_probe, |
1392 | .shutdown = ifx_spi_spi_shutdown, | 1368 | .shutdown = ifx_spi_spi_shutdown, |
1393 | .remove = ifx_spi_spi_remove, | 1369 | .remove = ifx_spi_spi_remove, |
1394 | .suspend = ifx_spi_spi_suspend, | ||
1395 | .resume = ifx_spi_spi_resume, | ||
1396 | .id_table = ifx_id_table | 1370 | .id_table = ifx_id_table |
1397 | }; | 1371 | }; |
1398 | 1372 | ||