sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'master' into next

This commit is contained in:
Sascha Hauer 2011-12-23 11:25:37 +01:00
parent fb44dd696e 4b8750c956
commit 81e1f6d020
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/serial/amba-pl011.c
View File

@ -159,7 +159,7 @@ static int pl011_probe(struct device_d *dev)
struct amba_uart_port *uart;
struct console_device *cdev;
uart = xmalloc(sizeof(struct amba_uart_port));
uart = xzalloc(sizeof(struct amba_uart_port));
uart->clk = clk_get(dev, NULL);
if (IS_ERR(uart->clk))

2
drivers/serial/atmel.c
View File

@ -399,7 +399,7 @@ static int atmel_serial_probe(struct device_d *dev)
struct atmel_uart_port *uart;
struct console_device *cdev;
uart = xmalloc(sizeof(struct atmel_uart_port));
uart = xzalloc(sizeof(struct atmel_uart_port));
cdev = &uart->uart;
dev->type_data = cdev;
cdev->dev = dev;

2
drivers/serial/serial_altera.c
View File

@ -85,7 +85,7 @@ static int altera_serial_probe(struct device_d *dev)
struct console_device *cdev;
struct altera_serial_priv *priv;
priv = xmalloc(sizeof(*priv));
priv = xzalloc(sizeof(*priv));
cdev = &priv->cdev;
priv->regs = dev_request_mem_region(dev, 0);

2
drivers/serial/serial_altera_jtag.c
View File

@ -90,7 +90,7 @@ static int altera_serial_jtag_probe(struct device_d *dev) {
struct console_device *cdev;
struct altera_serial_jtag_priv *priv;
priv = xmalloc(sizeof(*priv));
priv = xzalloc(sizeof(*priv));
cdev = &priv->cdev;
priv->regs = dev_request_mem_region(dev, 0);

2
drivers/serial/serial_blackfin.c
View File

@ -115,7 +115,7 @@ static int blackfin_serial_probe(struct device_d *dev)
{
struct console_device *cdev;
cdev = xmalloc(sizeof(struct console_device));
cdev = xzalloc(sizeof(struct console_device));
dev->type_data = cdev;
cdev->dev = dev;
cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR;

2
drivers/serial/serial_imx.c
View File

@ -320,7 +320,7 @@ static int imx_serial_probe(struct device_d *dev)
struct imx_serial_priv *priv;
uint32_t val;
priv = xmalloc(sizeof(*priv));
priv = xzalloc(sizeof(*priv));
cdev = &priv->cdev;
priv->regs = dev_request_mem_region(dev, 0);

2
drivers/serial/serial_netx.c
View File

@ -140,7 +140,7 @@ static int netx_serial_probe(struct device_d *dev)
{
struct console_device *cdev;
cdev = xmalloc(sizeof(struct console_device));
cdev = xzalloc(sizeof(struct console_device));
dev->type_data = cdev;
dev->priv = dev_request_mem_region(dev, 0);
cdev->dev = dev;

2
drivers/serial/serial_pl010.c
View File

@ -141,7 +141,7 @@ static int pl010_probe(struct device_d *dev)
{
struct console_device *cdev;
cdev = xmalloc(sizeof(struct console_device));
cdev = xzalloc(sizeof(struct console_device));
dev->type_data = cdev;
dev->priv = dev_request_mem_region(dev, 0);
cdev->dev = dev;

2
drivers/serial/serial_s3c24x0.c
View File

@ -129,7 +129,7 @@ static int s3c24x0_serial_probe(struct device_d *dev)
{
struct console_device *cdev;
cdev = xmalloc(sizeof(struct console_device));
cdev = xzalloc(sizeof(struct console_device));
dev->type_data = cdev;
dev->priv = dev_request_mem_region(dev, 0);
cdev->dev = dev;

2
include/command.h
View File

@ -95,7 +95,7 @@ static const __maybe_unused char cmd_##_name##_help[] =
#define BAREBOX_CMD_HELP_USAGE(_name) "Usage: " _name
#define BAREBOX_CMD_HELP_SHORT(_text) _text
#define BAREBOX_CMD_HELP_OPT(_opt, _desc) _opt "\t" _desc
#define BAREBOX_CMD_HELP_TEXT(_text)
#define BAREBOX_CMD_HELP_TEXT(_text) _text
#define BAREBOX_CMD_HELP_END ;
#ifdef CONFIG_LONGHELP