diff options
Diffstat (limited to 'drivers/ide/ppc/pmac.c')
-rw-r--r-- | drivers/ide/ppc/pmac.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index ebf961f1718d..996c694341bc 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -1154,7 +1154,7 @@ static int | |||
1154 | pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) | 1154 | pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) |
1155 | { | 1155 | { |
1156 | struct device_node *np = pmif->node; | 1156 | struct device_node *np = pmif->node; |
1157 | int *bidp; | 1157 | const int *bidp; |
1158 | 1158 | ||
1159 | pmif->cable_80 = 0; | 1159 | pmif->cable_80 = 0; |
1160 | pmif->broken_dma = pmif->broken_dma_warn = 0; | 1160 | pmif->broken_dma = pmif->broken_dma_warn = 0; |
@@ -1176,14 +1176,14 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) | |||
1176 | pmif->broken_dma = 1; | 1176 | pmif->broken_dma = 1; |
1177 | } | 1177 | } |
1178 | 1178 | ||
1179 | bidp = (int *)get_property(np, "AAPL,bus-id", NULL); | 1179 | bidp = get_property(np, "AAPL,bus-id", NULL); |
1180 | pmif->aapl_bus_id = bidp ? *bidp : 0; | 1180 | pmif->aapl_bus_id = bidp ? *bidp : 0; |
1181 | 1181 | ||
1182 | /* Get cable type from device-tree */ | 1182 | /* Get cable type from device-tree */ |
1183 | if (pmif->kind == controller_kl_ata4 || pmif->kind == controller_un_ata6 | 1183 | if (pmif->kind == controller_kl_ata4 || pmif->kind == controller_un_ata6 |
1184 | || pmif->kind == controller_k2_ata6 | 1184 | || pmif->kind == controller_k2_ata6 |
1185 | || pmif->kind == controller_sh_ata6) { | 1185 | || pmif->kind == controller_sh_ata6) { |
1186 | char* cable = get_property(np, "cable-type", NULL); | 1186 | const char* cable = get_property(np, "cable-type", NULL); |
1187 | if (cable && !strncmp(cable, "80-", 3)) | 1187 | if (cable && !strncmp(cable, "80-", 3)) |
1188 | pmif->cable_80 = 1; | 1188 | pmif->cable_80 = 1; |
1189 | } | 1189 | } |
@@ -1326,7 +1326,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) | |||
1326 | if (macio_irq_count(mdev) == 0) { | 1326 | if (macio_irq_count(mdev) == 0) { |
1327 | printk(KERN_WARNING "ide%d: no intrs for device %s, using 13\n", | 1327 | printk(KERN_WARNING "ide%d: no intrs for device %s, using 13\n", |
1328 | i, mdev->ofdev.node->full_name); | 1328 | i, mdev->ofdev.node->full_name); |
1329 | irq = 13; | 1329 | irq = irq_create_mapping(NULL, 13); |
1330 | } else | 1330 | } else |
1331 | irq = macio_irq(mdev, 0); | 1331 | irq = macio_irq(mdev, 0); |
1332 | 1332 | ||