From: Haavard Skinnemoen <hskinnemoen@atmel.com>
To: Andrew Victor <andrew@sanpeople.com>
Cc: Russell King <rmk+lkml@arm.linux.org.uk>,
linux-kernel@vger.kernel.org, hskinnemoen@atmel.com
Subject: [PATCH 8/8] atmel_serial: Kill at91_register_uart_fns
Date: Wed, 27 Sep 2006 18:58:05 +0200 [thread overview]
Message-ID: <11593762852950-git-send-email-hskinnemoen@atmel.com> (raw)
In-Reply-To: <1159376285621-git-send-email-hskinnemoen@atmel.com>
at91_register_uart_fns has no users as far as I can see. Let's get
rid of it.
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
---
drivers/serial/atmel_serial.c | 41 ----------------------------------
include/asm-arm/mach/serial_at91.h | 33 ---------------------------
include/asm-avr32/mach/serial_at91.h | 33 ---------------------------
3 files changed, 0 insertions(+), 107 deletions(-)
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 420921d..ae29b78 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -37,7 +37,6 @@ #include <linux/platform_device.h>
#include <asm/io.h>
#include <asm/arch/at91rm9200_pdc.h>
-#include <asm/mach/serial_at91.h>
#include <asm/arch/board.h>
#include <asm/arch/system.h>
#include <asm/arch/gpio.h>
@@ -101,9 +100,6 @@ #define UART_PUT_TCR(port,v) writel(v, (
//#define UART_PUT_TNPR(port,v) writel(v, (port)->membase + ATMEL_PDC_TNPR)
//#define UART_PUT_TNCR(port,v) writel(v, (port)->membase + ATMEL_PDC_TNCR)
-static int (*at91_open)(struct uart_port *);
-static void (*at91_close)(struct uart_port *);
-
/*
* We wrap our port structure around the generic uart_port.
*/
@@ -396,18 +392,6 @@ static int atmel_startup(struct uart_por
}
/*
- * If there is a specific "open" function (to register
- * control line interrupts)
- */
- if (at91_open) {
- retval = at91_open(port);
- if (retval) {
- free_irq(port->irq, port);
- return retval;
- }
- }
-
- /*
* Finally, enable the serial port
*/
UART_PUT_CR(port, ATMEL_US_RSTSTA | ATMEL_US_RSTRX);
@@ -435,13 +419,6 @@ static void atmel_shutdown(struct uart_p
* Free the interrupt
*/
free_irq(port->irq, port);
-
- /*
- * If there is a specific "close" function (to unregister
- * control line interrupts)
- */
- if (at91_close)
- at91_close(port);
}
/*
@@ -708,24 +685,6 @@ static void __devinit atmel_init_port(st
}
}
-/*
- * Register board-specific modem-control line handlers.
- */
-void __init at91_register_uart_fns(struct at91_port_fns *fns)
-{
- if (fns->enable_ms)
- atmel_pops.enable_ms = fns->enable_ms;
- if (fns->get_mctrl)
- atmel_pops.get_mctrl = fns->get_mctrl;
- if (fns->set_mctrl)
- atmel_pops.set_mctrl = fns->set_mctrl;
- at91_open = fns->open;
- at91_close = fns->close;
- atmel_pops.pm = fns->pm;
- atmel_pops.set_wake = fns->set_wake;
-}
-
-
#ifdef CONFIG_SERIAL_ATMEL_CONSOLE
static void atmel_console_putchar(struct uart_port *port, int ch)
{
diff --git a/include/asm-arm/mach/serial_at91.h b/include/asm-arm/mach/serial_at91.h
deleted file mode 100644
index 239e1f6..0000000
--- a/include/asm-arm/mach/serial_at91.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * linux/include/asm-arm/mach/serial_at91.h
- *
- * Based on serial_sa1100.h by Nicolas Pitre
- *
- * Copyright (C) 2002 ATMEL Rousset
- *
- * Low level machine dependent UART functions.
- */
-
-struct uart_port;
-
-/*
- * This is a temporary structure for registering these
- * functions; it is intended to be discarded after boot.
- */
-struct at91_port_fns {
- void (*set_mctrl)(struct uart_port *, u_int);
- u_int (*get_mctrl)(struct uart_port *);
- void (*enable_ms)(struct uart_port *);
- void (*pm)(struct uart_port *, u_int, u_int);
- int (*set_wake)(struct uart_port *, u_int);
- int (*open)(struct uart_port *);
- void (*close)(struct uart_port *);
-};
-
-#if defined(CONFIG_SERIAL_ATMEL)
-void at91_register_uart_fns(struct at91_port_fns *fns);
-#else
-#define at91_register_uart_fns(fns) do { } while (0)
-#endif
-
-
diff --git a/include/asm-avr32/mach/serial_at91.h b/include/asm-avr32/mach/serial_at91.h
deleted file mode 100644
index 239e1f6..0000000
--- a/include/asm-avr32/mach/serial_at91.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * linux/include/asm-arm/mach/serial_at91.h
- *
- * Based on serial_sa1100.h by Nicolas Pitre
- *
- * Copyright (C) 2002 ATMEL Rousset
- *
- * Low level machine dependent UART functions.
- */
-
-struct uart_port;
-
-/*
- * This is a temporary structure for registering these
- * functions; it is intended to be discarded after boot.
- */
-struct at91_port_fns {
- void (*set_mctrl)(struct uart_port *, u_int);
- u_int (*get_mctrl)(struct uart_port *);
- void (*enable_ms)(struct uart_port *);
- void (*pm)(struct uart_port *, u_int, u_int);
- int (*set_wake)(struct uart_port *, u_int);
- int (*open)(struct uart_port *);
- void (*close)(struct uart_port *);
-};
-
-#if defined(CONFIG_SERIAL_ATMEL)
-void at91_register_uart_fns(struct at91_port_fns *fns);
-#else
-#define at91_register_uart_fns(fns) do { } while (0)
-#endif
-
-
--
1.4.1.1
next prev parent reply other threads:[~2006-09-27 16:58 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-27 16:57 [PATCH 0/8] Rename at91_serial driver as atmel_serial Haavard Skinnemoen
2006-09-27 16:57 ` [PATCH 1/8] at91_serial -> atmel_serial: at91rm9200_usart.h Haavard Skinnemoen
2006-09-27 16:57 ` [PATCH 2/8] at91_serial -> atmel_serial: at91_serial.c Haavard Skinnemoen
2006-09-27 16:58 ` [PATCH 3/8] at91_serial -> atmel_serial: Kconfig symbols Haavard Skinnemoen
2006-09-27 16:58 ` [PATCH 4/8] at91_serial -> atmel_serial: Platform device name Haavard Skinnemoen
2006-09-27 16:58 ` [PATCH 5/8] at91_serial -> atmel_serial: Public definitions Haavard Skinnemoen
2006-09-27 16:58 ` [PATCH 6/8] at91_serial -> atmel_serial: Internal names Haavard Skinnemoen
2006-09-27 16:58 ` [PATCH 7/8] serial: Rename PORT_AT91 -> PORT_ATMEL Haavard Skinnemoen
2006-09-27 16:58 ` Haavard Skinnemoen [this message]
2006-09-28 9:21 ` [PATCH 8/8] atmel_serial: Kill at91_register_uart_fns Andrew Victor
2006-09-28 9:38 ` Haavard Skinnemoen
2006-09-28 11:14 ` Andrew Victor
2006-09-28 11:51 ` Haavard Skinnemoen
2006-09-28 11:56 ` Andrew Victor
2006-09-28 17:02 ` Sam Ravnborg
2006-09-28 9:03 ` [PATCH 7/8] serial: Rename PORT_AT91 -> PORT_ATMEL Andrew Victor
2006-09-28 9:02 ` [PATCH 6/8] at91_serial -> atmel_serial: Internal names Andrew Victor
2006-09-28 8:54 ` [PATCH 5/8] at91_serial -> atmel_serial: Public definitions Andrew Victor
2006-09-28 9:24 ` Haavard Skinnemoen
2006-09-28 9:22 ` Andrew Victor
2006-09-28 8:35 ` [PATCH 4/8] at91_serial -> atmel_serial: Platform device name Andrew Victor
2006-09-28 12:55 ` Haavard Skinnemoen
2006-09-28 8:34 ` [PATCH 3/8] at91_serial -> atmel_serial: Kconfig symbols Andrew Victor
2006-09-28 8:54 ` Haavard Skinnemoen
2006-09-28 8:50 ` Andrew Victor
2006-09-28 8:22 ` [PATCH 2/8] at91_serial -> atmel_serial: at91_serial.c Andrew Victor
2006-09-28 8:20 ` [PATCH 1/8] at91_serial -> atmel_serial: at91rm9200_usart.h Andrew Victor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11593762852950-git-send-email-hskinnemoen@atmel.com \
--to=hskinnemoen@atmel.com \
--cc=andrew@sanpeople.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk+lkml@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®