Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 89340
b: refs/heads/master
c: af007ec
h: refs/heads/master
v: v3
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Apr 17, 2008
1 parent 1cb2e99 commit 961fe45
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 48 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: e3bfae4c105c9b79a539bb868e8541d2ad38deee
refs/heads/master: af007ec6c9467c2a26f5f684cee52efa497280c4
47 changes: 0 additions & 47 deletions trunk/drivers/ide/ppc/pmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ typedef struct pmac_ide_hwif {
} pmac_ide_hwif_t;

static pmac_ide_hwif_t pmac_ide[MAX_HWIFS];
static int pmac_ide_count;

enum {
controller_ohare, /* OHare based */
Expand Down Expand Up @@ -893,52 +892,6 @@ pmac_ide_get_base(int index)
return pmac_ide[index].regbase;
}

int
pmac_ide_check_base(unsigned long base)
{
int ix;

for (ix = 0; ix < MAX_HWIFS; ++ix)
if (base == pmac_ide[ix].regbase)
return ix;
return -1;
}

int
pmac_ide_get_irq(unsigned long base)
{
int ix;

for (ix = 0; ix < MAX_HWIFS; ++ix)
if (base == pmac_ide[ix].regbase)
return pmac_ide[ix].irq;
return 0;
}

static int ide_majors[] = { 3, 22, 33, 34, 56, 57 };

dev_t __init
pmac_find_ide_boot(char *bootdevice, int n)
{
int i;

/*
* Look through the list of IDE interfaces for this one.
*/
for (i = 0; i < pmac_ide_count; ++i) {
char *name;
if (!pmac_ide[i].node || !pmac_ide[i].node->full_name)
continue;
name = pmac_ide[i].node->full_name;
if (memcmp(name, bootdevice, n) == 0 && name[n] == 0) {
/* XXX should cope with the 2nd drive as well... */
return MKDEV(ide_majors[i], 0);
}
}

return 0;
}

/* Suspend call back, should be called after the child devices
* have actually been suspended
*/
Expand Down

0 comments on commit 961fe45

Please sign in to comment.