diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/68328serial.c | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c index cad426c9711e..151bd9ad3ab2 100644 --- a/drivers/serial/68328serial.c +++ b/drivers/serial/68328serial.c | |||
@@ -33,7 +33,6 @@ | |||
33 | #include <linux/keyboard.h> | 33 | #include <linux/keyboard.h> |
34 | #include <linux/init.h> | 34 | #include <linux/init.h> |
35 | #include <linux/pm.h> | 35 | #include <linux/pm.h> |
36 | #include <linux/pm_legacy.h> | ||
37 | #include <linux/bitops.h> | 36 | #include <linux/bitops.h> |
38 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
39 | 38 | ||
@@ -1324,59 +1323,6 @@ static void show_serial_version(void) | |||
1324 | printk("MC68328 serial driver version 1.00\n"); | 1323 | printk("MC68328 serial driver version 1.00\n"); |
1325 | } | 1324 | } |
1326 | 1325 | ||
1327 | #ifdef CONFIG_PM_LEGACY | ||
1328 | /* Serial Power management | ||
1329 | * The console (currently fixed at line 0) is a special case for power | ||
1330 | * management because the kernel is so chatty. The console will be | ||
1331 | * explicitly disabled my our power manager as the last minute, so we won't | ||
1332 | * mess with it here. | ||
1333 | */ | ||
1334 | static struct pm_dev *serial_pm[NR_PORTS]; | ||
1335 | |||
1336 | static int serial_pm_callback(struct pm_dev *dev, pm_request_t request, void *data) | ||
1337 | { | ||
1338 | struct m68k_serial *info = (struct m68k_serial *)dev->data; | ||
1339 | |||
1340 | if(info == NULL) | ||
1341 | return -1; | ||
1342 | |||
1343 | /* special case for line 0 - pm restores it */ | ||
1344 | if(info->line == 0) | ||
1345 | return 0; | ||
1346 | |||
1347 | switch (request) { | ||
1348 | case PM_SUSPEND: | ||
1349 | shutdown(info); | ||
1350 | break; | ||
1351 | |||
1352 | case PM_RESUME: | ||
1353 | startup(info); | ||
1354 | break; | ||
1355 | } | ||
1356 | return 0; | ||
1357 | } | ||
1358 | |||
1359 | void shutdown_console(void) | ||
1360 | { | ||
1361 | struct m68k_serial *info = &m68k_soft[0]; | ||
1362 | |||
1363 | /* HACK: wait a bit for any pending printk's to be dumped */ | ||
1364 | { | ||
1365 | int i = 10000; | ||
1366 | while(i--); | ||
1367 | } | ||
1368 | |||
1369 | shutdown(info); | ||
1370 | } | ||
1371 | |||
1372 | void startup_console(void) | ||
1373 | { | ||
1374 | struct m68k_serial *info = &m68k_soft[0]; | ||
1375 | startup(info); | ||
1376 | } | ||
1377 | #endif /* CONFIG_PM_LEGACY */ | ||
1378 | |||
1379 | |||
1380 | static const struct tty_operations rs_ops = { | 1326 | static const struct tty_operations rs_ops = { |
1381 | .open = rs_open, | 1327 | .open = rs_open, |
1382 | .close = rs_close, | 1328 | .close = rs_close, |
@@ -1467,11 +1413,6 @@ rs68328_init(void) | |||
1467 | IRQ_FLG_STD, | 1413 | IRQ_FLG_STD, |
1468 | "M68328_UART", NULL)) | 1414 | "M68328_UART", NULL)) |
1469 | panic("Unable to attach 68328 serial interrupt\n"); | 1415 | panic("Unable to attach 68328 serial interrupt\n"); |
1470 | #ifdef CONFIG_PM_LEGACY | ||
1471 | serial_pm[i] = pm_register(PM_SYS_DEV, PM_SYS_COM, serial_pm_callback); | ||
1472 | if (serial_pm[i]) | ||
1473 | serial_pm[i]->data = info; | ||
1474 | #endif | ||
1475 | } | 1416 | } |
1476 | local_irq_restore(flags); | 1417 | local_irq_restore(flags); |
1477 | return 0; | 1418 | return 0; |