projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ide: keep pointer to struct device instead of struct pci_dev in ide_hwif_t
[deliverable/linux.git]
/
drivers
/
ide
/
pci
/
aec62xx.c
diff --git
a/drivers/ide/pci/aec62xx.c
b/drivers/ide/pci/aec62xx.c
index 15597597740f29c1731c8c7c411acbfe89913dd0..28401701b8d06f7751f0d4a18ac12b7e264a74e1 100644
(file)
--- a/
drivers/ide/pci/aec62xx.c
+++ b/
drivers/ide/pci/aec62xx.c
@@
-90,7
+90,7
@@
static u8 pci_bus_clock_list_ultra (u8 speed, struct chipset_bus_clock_list_entr
static void aec6210_set_mode(ide_drive_t *drive, const u8 speed)
{
ide_hwif_t *hwif = HWIF(drive);
static void aec6210_set_mode(ide_drive_t *drive, const u8 speed)
{
ide_hwif_t *hwif = HWIF(drive);
- struct pci_dev *dev =
hwif->pci_dev
;
+ struct pci_dev *dev =
to_pci_dev(hwif->dev)
;
u16 d_conf = 0;
u8 ultra = 0, ultra_conf = 0;
u8 tmp0 = 0, tmp1 = 0, tmp2 = 0;
u16 d_conf = 0;
u8 ultra = 0, ultra_conf = 0;
u8 tmp0 = 0, tmp1 = 0, tmp2 = 0;
@@
-116,7
+116,7
@@
static void aec6210_set_mode(ide_drive_t *drive, const u8 speed)
static void aec6260_set_mode(ide_drive_t *drive, const u8 speed)
{
ide_hwif_t *hwif = HWIF(drive);
static void aec6260_set_mode(ide_drive_t *drive, const u8 speed)
{
ide_hwif_t *hwif = HWIF(drive);
- struct pci_dev *dev =
hwif->pci_dev
;
+ struct pci_dev *dev =
to_pci_dev(hwif->dev)
;
u8 unit = (drive->select.b.unit & 0x01);
u8 tmp1 = 0, tmp2 = 0;
u8 ultra = 0, drive_conf = 0, ultra_conf = 0;
u8 unit = (drive->select.b.unit & 0x01);
u8 tmp1 = 0, tmp2 = 0;
u8 ultra = 0, drive_conf = 0, ultra_conf = 0;
@@
-170,7
+170,7
@@
static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const ch
static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
{
static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
{
- struct pci_dev *dev
= hwif->pci_dev
;
+ struct pci_dev *dev
= to_pci_dev(hwif->dev)
;
hwif->set_pio_mode = &aec_set_pio_mode;
hwif->set_pio_mode = &aec_set_pio_mode;
@@
-188,7
+188,7
@@
static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
if (hwif->cbl != ATA_CBL_PATA40_SHORT) {
u8 ata66 = 0, mask = hwif->channel ? 0x02 : 0x01;
if (hwif->cbl != ATA_CBL_PATA40_SHORT) {
u8 ata66 = 0, mask = hwif->channel ? 0x02 : 0x01;
- pci_read_config_byte(
hwif->pci_
dev, 0x49, &ata66);
+ pci_read_config_byte(dev, 0x49, &ata66);
hwif->cbl = (ata66 & mask) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
}
hwif->cbl = (ata66 & mask) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
}
This page took
0.040642 seconds
and
5
git commands to generate.