1 files changed, 4 insertions, 76 deletions

diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index 68d7ce997ede..8b1534c424af 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -270,23 +270,6 @@ static void mrdy_assert(struct ifx_spi_device *ifx_dev)
 }
 
 /**
- *      ifx_spi_hangup          -       hang up an IFX device
- *      @ifx_dev: our SPI device
- *
- *      Hang up the tty attached to the IFX device if one is currently
- *      open. If not take no action
- */
-static void ifx_spi_ttyhangup(struct ifx_spi_device *ifx_dev)
-{
-        struct tty_port *pport = &ifx_dev->tty_port;
-        struct tty_struct *tty = tty_port_tty_get(pport);
-        if (tty) {
-                tty_hangup(tty);
-                tty_kref_put(tty);
-        }
-}
-
-/**
  *      ifx_spi_timeout         -       SPI timeout
  *      @arg: our SPI device
  *
@@ -298,7 +281,7 @@ static void ifx_spi_timeout(unsigned long arg)
         struct ifx_spi_device *ifx_dev = (struct ifx_spi_device *)arg;
 
         dev_warn(&ifx_dev->spi_dev->dev, "*** SPI Timeout ***");
-        ifx_spi_ttyhangup(ifx_dev);
+        tty_port_tty_hangup(&ifx_dev->tty_port, false);
         mrdy_set_low(ifx_dev);
         clear_bit(IFX_SPI_STATE_TIMER_PENDING, &ifx_dev->flags);
 }
@@ -443,25 +426,6 @@ static void ifx_spi_setup_spi_header(unsigned char *txbuffer, int tx_count,
 }
 
 /**
- *      ifx_spi_wakeup_serial   -       SPI space made
- *      @port_data: our SPI device
- *
- *      We have emptied the FIFO enough that we want to get more data
- *      queued into it. Poke the line discipline via tty_wakeup so that
- *      it will feed us more bits
- */
-static void ifx_spi_wakeup_serial(struct ifx_spi_device *ifx_dev)
-{
-        struct tty_struct *tty;
-
-        tty = tty_port_tty_get(&ifx_dev->tty_port);
-        if (!tty)
-                return;
-        tty_wakeup(tty);
-        tty_kref_put(tty);
-}
-
-/**
  *      ifx_spi_prepare_tx_buffer       -       prepare transmit frame
  *      @ifx_dev: our SPI device
  *
@@ -506,7 +470,7 @@ static int ifx_spi_prepare_tx_buffer(struct ifx_spi_device *ifx_dev)
                         tx_count += temp_count;
                         if (temp_count == queue_length)
                                 /* poke port to get more data */
-                                ifx_spi_wakeup_serial(ifx_dev);
+                                tty_port_tty_wakeup(&ifx_dev->tty_port);
                         else /* more data in port, use next SPI message */
                                 ifx_dev->spi_more = 1;
                 }
@@ -683,8 +647,6 @@ static void ifx_spi_insert_flip_string(struct ifx_spi_device *ifx_dev,
 static void ifx_spi_complete(void *ctx)
 {
         struct ifx_spi_device *ifx_dev = ctx;
-        struct tty_struct *tty;
-        struct tty_ldisc *ldisc = NULL;
         int length;
         int actual_length;
         unsigned char more;
@@ -762,15 +724,7 @@ complete_exit:
                          */
                         ifx_spi_power_state_clear(ifx_dev,
                                                   IFX_SPI_POWER_DATA_PENDING);
-                        tty = tty_port_tty_get(&ifx_dev->tty_port);
-                        if (tty) {
-                                ldisc = tty_ldisc_ref(tty);
-                                if (ldisc) {
-                                        ldisc->ops->write_wakeup(tty);
-                                        tty_ldisc_deref(ldisc);
-                                }
-                                tty_kref_put(tty);
-                        }
+                        tty_port_tty_wakeup(&ifx_dev->tty_port);
                 }
         }
 }
@@ -962,7 +916,7 @@ static irqreturn_t ifx_spi_reset_interrupt(int irq, void *dev)
                 set_bit(MR_INPROGRESS, &ifx_dev->mdm_reset_state);
                 if (!solreset) {
                         /* unsolicited reset  */
-                        ifx_spi_ttyhangup(ifx_dev);
+                        tty_port_tty_hangup(&ifx_dev->tty_port, false);
                 }
         } else {
                 /* exited reset */
@@ -1325,30 +1279,6 @@ static void ifx_spi_spi_shutdown(struct spi_device *spi)
  */
 
 /**
- *      ifx_spi_spi_suspend     -       suspend SPI on system suspend
- *      @dev: device being suspended
- *
- *      Suspend the SPI side. No action needed on Intel MID platforms, may
- *      need extending for other systems.
- */
-static int ifx_spi_spi_suspend(struct spi_device *spi, pm_message_t msg)
-{
-        return 0;
-}
-
-/**
- *      ifx_spi_spi_resume      -       resume SPI side on system resume
- *      @dev: device being suspended
- *
- *      Suspend the SPI side. No action needed on Intel MID platforms, may
- *      need extending for other systems.
- */
-static int ifx_spi_spi_resume(struct spi_device *spi)
-{
-        return 0;
-}
-
-/**
  *      ifx_spi_pm_suspend      -       suspend modem on system suspend
  *      @dev: device being suspended
  *
@@ -1437,8 +1367,6 @@ static struct spi_driver ifx_spi_driver = {
         .probe = ifx_spi_spi_probe,
         .shutdown = ifx_spi_spi_shutdown,
         .remove = ifx_spi_spi_remove,
-        .suspend = ifx_spi_spi_suspend,
-        .resume = ifx_spi_spi_resume,
         .id_table = ifx_id_table
 };