projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ide
/
palm_bk3710.c
diff --git
a/drivers/ide/palm_bk3710.c
b/drivers/ide/palm_bk3710.c
index 712c7904d03e5d460854cc565bf139bf29f3290e..6107cc4ee012a16b27f1e0bb75bc328fbca89445 100644
(file)
--- a/
drivers/ide/palm_bk3710.c
+++ b/
drivers/ide/palm_bk3710.c
@@
-220,7
+220,7
@@
static void palm_bk3710_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
palm_bk3710_setpiomode(base, mate, is_slave, cycle_time, pio);
}
palm_bk3710_setpiomode(base, mate, is_slave, cycle_time, pio);
}
-static void
__devinit
palm_bk3710_chipinit(void __iomem *base)
+static void palm_bk3710_chipinit(void __iomem *base)
{
/*
* REVISIT: the ATA reset signal needs to be managed through a
{
/*
* REVISIT: the ATA reset signal needs to be managed through a
@@
-282,8
+282,7
@@
static u8 palm_bk3710_cable_detect(ide_hwif_t *hwif)
return ATA_CBL_PATA80;
}
return ATA_CBL_PATA80;
}
-static int __devinit palm_bk3710_init_dma(ide_hwif_t *hwif,
- const struct ide_port_info *d)
+static int palm_bk3710_init_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
{
printk(KERN_INFO " %s: MMIO-DMA\n", hwif->name);
{
printk(KERN_INFO " %s: MMIO-DMA\n", hwif->name);
@@
-301,7
+300,7
@@
static const struct ide_port_ops palm_bk3710_ports_ops = {
.cable_detect = palm_bk3710_cable_detect,
};
.cable_detect = palm_bk3710_cable_detect,
};
-static struct ide_port_info
__devinitdata
palm_bk3710_port_info = {
+static struct ide_port_info palm_bk3710_port_info = {
.init_dma = palm_bk3710_init_dma,
.port_ops = &palm_bk3710_ports_ops,
.dma_ops = &sff_dma_ops,
.init_dma = palm_bk3710_init_dma,
.port_ops = &palm_bk3710_ports_ops,
.dma_ops = &sff_dma_ops,