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
/
sis5513.c
diff --git
a/drivers/ide/pci/sis5513.c
b/drivers/ide/pci/sis5513.c
index 85d36996e6af768ed2f23be7ab2bd23968eb6ac4..9fb4ba4ee318f1fb2ddb2360801baf3a3bf8a05f 100644
(file)
--- a/
drivers/ide/pci/sis5513.c
+++ b/
drivers/ide/pci/sis5513.c
@@
-197,7
+197,7
@@
static char* chipset_capability[] = {
static u8 sis_ata133_get_base(ide_drive_t *drive)
{
static u8 sis_ata133_get_base(ide_drive_t *drive)
{
- struct pci_dev *dev =
drive->hwif->pci_dev
;
+ struct pci_dev *dev =
to_pci_dev(drive->hwif->dev)
;
u32 reg54 = 0;
pci_read_config_dword(dev, 0x54, ®54);
u32 reg54 = 0;
pci_read_config_dword(dev, 0x54, ®54);
@@
-207,7
+207,7
@@
static u8 sis_ata133_get_base(ide_drive_t *drive)
static void sis_ata16_program_timings(ide_drive_t *drive, const u8 mode)
{
static void sis_ata16_program_timings(ide_drive_t *drive, const u8 mode)
{
- struct pci_dev *dev =
drive->hwif->pci_dev
;
+ struct pci_dev *dev =
to_pci_dev(drive->hwif->dev)
;
u16 t1 = 0;
u8 drive_pci = 0x40 + drive->dn * 2;
u16 t1 = 0;
u8 drive_pci = 0x40 + drive->dn * 2;
@@
-230,7
+230,7
@@
static void sis_ata16_program_timings(ide_drive_t *drive, const u8 mode)
static void sis_ata100_program_timings(ide_drive_t *drive, const u8 mode)
{
static void sis_ata100_program_timings(ide_drive_t *drive, const u8 mode)
{
- struct pci_dev *dev =
drive->hwif->pci_dev
;
+ struct pci_dev *dev =
to_pci_dev(drive->hwif->dev)
;
u8 t1, drive_pci = 0x40 + drive->dn * 2;
/* timing bits: 7:4 active 3:0 recovery */
u8 t1, drive_pci = 0x40 + drive->dn * 2;
/* timing bits: 7:4 active 3:0 recovery */
@@
-253,7
+253,7
@@
static void sis_ata100_program_timings(ide_drive_t *drive, const u8 mode)
static void sis_ata133_program_timings(ide_drive_t *drive, const u8 mode)
{
static void sis_ata133_program_timings(ide_drive_t *drive, const u8 mode)
{
- struct pci_dev *dev =
drive->hwif->pci_dev
;
+ struct pci_dev *dev =
to_pci_dev(drive->hwif->dev)
;
u32 t1 = 0;
u8 drive_pci = sis_ata133_get_base(drive), clk, idx;
u32 t1 = 0;
u8 drive_pci = sis_ata133_get_base(drive), clk, idx;
@@
-286,7
+286,7
@@
static void sis_program_timings(ide_drive_t *drive, const u8 mode)
static void config_drive_art_rwp (ide_drive_t *drive)
{
ide_hwif_t *hwif = HWIF(drive);
static void config_drive_art_rwp (ide_drive_t *drive)
{
ide_hwif_t *hwif = HWIF(drive);
- struct pci_dev *dev =
hwif->pci_dev
;
+ struct pci_dev *dev =
to_pci_dev(hwif->dev)
;
u8 reg4bh = 0;
u8 rw_prefetch = 0;
u8 reg4bh = 0;
u8 rw_prefetch = 0;
@@
-307,7
+307,7
@@
static void sis_set_pio_mode(ide_drive_t *drive, const u8 pio)
static void sis_ata133_program_udma_timings(ide_drive_t *drive, const u8 mode)
{
static void sis_ata133_program_udma_timings(ide_drive_t *drive, const u8 mode)
{
- struct pci_dev *dev =
drive->hwif->pci_dev
;
+ struct pci_dev *dev =
to_pci_dev(drive->hwif->dev)
;
u32 regdw = 0;
u8 drive_pci = sis_ata133_get_base(drive), clk, idx;
u32 regdw = 0;
u8 drive_pci = sis_ata133_get_base(drive), clk, idx;
@@
-326,7
+326,7
@@
static void sis_ata133_program_udma_timings(ide_drive_t *drive, const u8 mode)
static void sis_ata33_program_udma_timings(ide_drive_t *drive, const u8 mode)
{
static void sis_ata33_program_udma_timings(ide_drive_t *drive, const u8 mode)
{
- struct pci_dev *dev =
drive->hwif->pci_dev
;
+ struct pci_dev *dev =
to_pci_dev(drive->hwif->dev)
;
u8 drive_pci = 0x40 + drive->dn * 2, reg = 0, i = chipset_family;
pci_read_config_byte(dev, drive_pci + 1, ®);
u8 drive_pci = 0x40 + drive->dn * 2, reg = 0, i = chipset_family;
pci_read_config_byte(dev, drive_pci + 1, ®);
@@
-359,7
+359,7
@@
static void sis_set_dma_mode(ide_drive_t *drive, const u8 speed)
static u8 sis5513_ata133_udma_filter(ide_drive_t *drive)
{
static u8 sis5513_ata133_udma_filter(ide_drive_t *drive)
{
- struct pci_dev *dev =
drive->hwif->pci_dev
;
+ struct pci_dev *dev =
to_pci_dev(drive->hwif->dev)
;
u32 regdw = 0;
u8 drive_pci = sis_ata133_get_base(drive);
u32 regdw = 0;
u8 drive_pci = sis_ata133_get_base(drive);
@@
-530,7
+530,7
@@
static const struct sis_laptop sis_laptop[] = {
static u8 __devinit ata66_sis5513(ide_hwif_t *hwif)
{
static u8 __devinit ata66_sis5513(ide_hwif_t *hwif)
{
- struct pci_dev *pdev =
hwif->pci_dev
;
+ struct pci_dev *pdev =
to_pci_dev(hwif->dev)
;
const struct sis_laptop *lap = &sis_laptop[0];
u8 ata66 = 0;
const struct sis_laptop *lap = &sis_laptop[0];
u8 ata66 = 0;
@@
-545,12
+545,12
@@
static u8 __devinit ata66_sis5513(ide_hwif_t *hwif)
if (chipset_family >= ATA_133) {
u16 regw = 0;
u16 reg_addr = hwif->channel ? 0x52: 0x50;
if (chipset_family >= ATA_133) {
u16 regw = 0;
u16 reg_addr = hwif->channel ? 0x52: 0x50;
- pci_read_config_word(
hwif->pci_
dev, reg_addr, ®w);
+ pci_read_config_word(
p
dev, reg_addr, ®w);
ata66 = (regw & 0x8000) ? 0 : 1;
} else if (chipset_family >= ATA_66) {
u8 reg48h = 0;
u8 mask = hwif->channel ? 0x20 : 0x10;
ata66 = (regw & 0x8000) ? 0 : 1;
} else if (chipset_family >= ATA_66) {
u8 reg48h = 0;
u8 mask = hwif->channel ? 0x20 : 0x10;
- pci_read_config_byte(
hwif->pci_
dev, 0x48, ®48h);
+ pci_read_config_byte(
p
dev, 0x48, ®48h);
ata66 = (reg48h & mask) ? 0 : 1;
}
ata66 = (reg48h & mask) ? 0 : 1;
}
This page took
0.038135 seconds
and
5
git commands to generate.