Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 66079
b: refs/heads/master
c: 4a24d86
h: refs/heads/master
i:
  66077: 1bb6c8e
  66075: ef87099
  66071: 8a72dec
  66063: c613f9c
  66047: 37f1e64
v: v3
  • Loading branch information
Grant Likely authored and Jens Axboe committed Oct 10, 2007
1 parent a968551 commit 88792e7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 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: 1b455466549f46bab0a75a7a296a9331a38fd6fa
refs/heads/master: 4a24d8610df542b6599a65b100d438df144574de
12 changes: 9 additions & 3 deletions trunk/drivers/block/xsysace.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,9 @@ MODULE_LICENSE("GPL");
#define ACE_FIFO_SIZE (32)
#define ACE_BUF_PER_SECTOR (ACE_SECTOR_SIZE / ACE_FIFO_SIZE)

#define ACE_BUS_WIDTH_8 0
#define ACE_BUS_WIDTH_16 1

struct ace_reg_ops;

struct ace_device {
Expand Down Expand Up @@ -931,9 +934,11 @@ static int __devinit ace_setup(struct ace_device *ace)
{
u16 version;
u16 val;

int rc;

dev_dbg(ace->dev, "ace_setup(ace=0x%p)\n", ace);
dev_dbg(ace->dev, "physaddr=0x%lx irq=%i\n", ace->physaddr, ace->irq);

spin_lock_init(&ace->lock);
init_completion(&ace->id_completion);

Expand Down Expand Up @@ -982,7 +987,7 @@ static int __devinit ace_setup(struct ace_device *ace)
snprintf(ace->gd->disk_name, 32, "xs%c", ace->id + 'a');

/* set bus width */
if (ace->bus_width == 1) {
if (ace->bus_width == ACE_BUS_WIDTH_16) {
/* 0x0101 should work regardless of endianess */
ace_out_le16(ace, ACE_BUSMODE, 0x0101);

Expand Down Expand Up @@ -1117,7 +1122,7 @@ static void __devexit ace_free(struct device *dev)
static int __devinit ace_probe(struct platform_device *dev)
{
unsigned long physaddr = 0;
int bus_width = 1; /* FIXME: should not be hard coded */
int bus_width = ACE_BUS_WIDTH_16; /* FIXME: should not be hard coded */
int id = dev->id;
int irq = NO_IRQ;
int i;
Expand Down Expand Up @@ -1166,6 +1171,7 @@ static int __init ace_init(void)
goto err_blk;
}

pr_debug("xsysace: registering platform binding\n");
if ((rc = platform_driver_register(&ace_platform_driver)) != 0)
goto err_plat;

Expand Down

0 comments on commit 88792e7

Please sign in to comment.