1 files changed, 3 insertions, 17 deletions

diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index f190a84a0246..473f4f81d690 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /****************************************************************************
  *
  * Driver for the IFX 6x60 spi modem.
@@ -10,20 +11,6 @@
  * Copyright (C) 2009, 2010 Intel Corp
  * Russ Gorby <russ.gorby@intel.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
- * USA
- *
  * Driver modified by Intel from Option gtm501l_spi.c
  *
  * Notes
@@ -1029,9 +1016,8 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
         spin_lock_init(&ifx_dev->write_lock);
         spin_lock_init(&ifx_dev->power_lock);
         ifx_dev->power_status = 0;
-        init_timer(&ifx_dev->spi_timer);
-        ifx_dev->spi_timer.function = ifx_spi_timeout;
-        ifx_dev->spi_timer.data = (unsigned long)ifx_dev;
+        setup_timer(&ifx_dev->spi_timer, ifx_spi_timeout,
+                    (unsigned long)ifx_dev);
         ifx_dev->modem = pl_data->modem_type;
         ifx_dev->use_dma = pl_data->use_dma;
         ifx_dev->max_hz = pl_data->max_hz;