Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 9848
b: refs/heads/master
c: 17efa64
h: refs/heads/master
v: v3
  • Loading branch information
Ben Dooks authored and Russell King committed Oct 12, 2005
1 parent 7c0cc21 commit 0c593fe
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0eea3c0b6cb356bc8e515084f831cac7e3d5131c
refs/heads/master: 17efa644f624a521e4a6c6a4641d39d227a9b24a
15 changes: 8 additions & 7 deletions trunk/drivers/serial/s3c2410.c
Original file line number Diff line number Diff line change
Expand Up @@ -1092,8 +1092,8 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,

static int probe_index = 0;

int s3c24xx_serial_probe(struct device *_dev,
struct s3c24xx_uart_info *info)
static int s3c24xx_serial_probe(struct device *_dev,
struct s3c24xx_uart_info *info)
{
struct s3c24xx_uart_port *ourport;
struct platform_device *dev = to_platform_device(_dev);
Expand All @@ -1120,7 +1120,7 @@ int s3c24xx_serial_probe(struct device *_dev,
return ret;
}

int s3c24xx_serial_remove(struct device *_dev)
static int s3c24xx_serial_remove(struct device *_dev)
{
struct uart_port *port = s3c24xx_dev_to_port(_dev);

Expand All @@ -1134,7 +1134,8 @@ int s3c24xx_serial_remove(struct device *_dev)

#ifdef CONFIG_PM

int s3c24xx_serial_suspend(struct device *dev, pm_message_t state, u32 level)
static int s3c24xx_serial_suspend(struct device *dev, pm_message_t state,
u32 level)
{
struct uart_port *port = s3c24xx_dev_to_port(dev);

Expand All @@ -1144,7 +1145,7 @@ int s3c24xx_serial_suspend(struct device *dev, pm_message_t state, u32 level)
return 0;
}

int s3c24xx_serial_resume(struct device *dev, u32 level)
static int s3c24xx_serial_resume(struct device *dev, u32 level)
{
struct uart_port *port = s3c24xx_dev_to_port(dev);
struct s3c24xx_uart_port *ourport = to_ourport(port);
Expand All @@ -1165,8 +1166,8 @@ int s3c24xx_serial_resume(struct device *dev, u32 level)
#define s3c24xx_serial_resume NULL
#endif

int s3c24xx_serial_init(struct device_driver *drv,
struct s3c24xx_uart_info *info)
static int s3c24xx_serial_init(struct device_driver *drv,
struct s3c24xx_uart_info *info)
{
dbg("s3c24xx_serial_init(%p,%p)\n", drv, info);
return driver_register(drv);
Expand Down

0 comments on commit 0c593fe

Please sign in to comment.