Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 81335
b: refs/heads/master
c: d0e5c21
h: refs/heads/master
i:
  81333: 72f41c1
  81331: 442e7d5
  81327: 97cbe60
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Paul Mackerras committed Jan 25, 2008
1 parent d1b67af commit 3f4de28
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 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: eff56c92a15c3dbb1e55efea5251e28c0e5efb8b
refs/heads/master: d0e5c2185e1c6508894e1ee1a8e9bf79e009e427
16 changes: 7 additions & 9 deletions trunk/drivers/ps3/ps3-vuart.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,18 +108,18 @@ static struct ps3_vuart_port_priv *to_port_priv(
struct ports_bmp {
u64 status;
u64 unused[3];
} __attribute__ ((aligned (32)));
} __attribute__((aligned(32)));

#define dump_ports_bmp(_b) _dump_ports_bmp(_b, __func__, __LINE__)
static void __maybe_unused _dump_ports_bmp(
const struct ports_bmp* bmp, const char* func, int line)
const struct ports_bmp *bmp, const char *func, int line)
{
pr_debug("%s:%d: ports_bmp: %016lxh\n", func, line, bmp->status);
}

#define dump_port_params(_b) _dump_port_params(_b, __func__, __LINE__)
static void __maybe_unused _dump_port_params(unsigned int port_number,
const char* func, int line)
const char *func, int line)
{
#if defined(DEBUG)
static const char *strings[] = {
Expand Down Expand Up @@ -363,7 +363,7 @@ int ps3_vuart_disable_interrupt_disconnect(struct ps3_system_bus_device *dev)
*/

static int ps3_vuart_raw_write(struct ps3_system_bus_device *dev,
const void* buf, unsigned int bytes, unsigned long *bytes_written)
const void *buf, unsigned int bytes, unsigned long *bytes_written)
{
int result;
struct ps3_vuart_port_priv *priv = to_port_priv(dev);
Expand Down Expand Up @@ -431,7 +431,7 @@ void ps3_vuart_clear_rx_bytes(struct ps3_system_bus_device *dev,
int result;
struct ps3_vuart_port_priv *priv = to_port_priv(dev);
u64 bytes_waiting;
void* tmp;
void *tmp;

result = ps3_vuart_get_rx_bytes_waiting(dev, &bytes_waiting);

Expand Down Expand Up @@ -526,9 +526,8 @@ int ps3_vuart_write(struct ps3_system_bus_device *dev, const void *buf,

lb = kmalloc(sizeof(struct list_buffer) + bytes, GFP_KERNEL);

if (!lb) {
if (!lb)
return -ENOMEM;
}

memcpy(lb->data, buf, bytes);
lb->head = lb->data;
Expand Down Expand Up @@ -926,9 +925,8 @@ static int ps3_vuart_bus_interrupt_get(void)

BUG_ON(vuart_bus_priv.use_count > 2);

if (vuart_bus_priv.use_count != 1) {
if (vuart_bus_priv.use_count != 1)
return 0;
}

BUG_ON(vuart_bus_priv.bmp);

Expand Down

0 comments on commit 3f4de28

Please sign in to comment.