X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Fsata_sis.c;h=d3228e2e7bd90b2c3da9f9bf1f1ee880aec6b3c9;hb=9e1bf581d67d87a1d7fc0ea500729e3a03643a26;hp=d48e437c91db4c6a6ee75cdf1d8beaa58774c0e5;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c index d48e437c9..d3228e2e7 100644 --- a/drivers/scsi/sata_sis.c +++ b/drivers/scsi/sata_sis.c @@ -38,7 +38,7 @@ #include #define DRV_NAME "sata_sis" -#define DRV_VERSION "0.5" +#define DRV_VERSION "0.10" enum { sis_180 = 0, @@ -141,24 +141,22 @@ static unsigned int get_scr_cfg_addr(unsigned int port_no, unsigned int sc_reg) static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg) { - struct pci_dev *pdev = to_pci_dev(ap->host_set->dev); unsigned int cfg_addr = get_scr_cfg_addr(ap->port_no, sc_reg); u32 val; if (sc_reg == SCR_ERROR) /* doesn't exist in PCI cfg space */ return 0xffffffff; - pci_read_config_dword(pdev, cfg_addr, &val); + pci_read_config_dword(ap->host_set->pdev, cfg_addr, &val); return val; } static void sis_scr_cfg_write (struct ata_port *ap, unsigned int scr, u32 val) { - struct pci_dev *pdev = to_pci_dev(ap->host_set->dev); unsigned int cfg_addr = get_scr_cfg_addr(ap->port_no, scr); if (scr == SCR_ERROR) /* doesn't exist in PCI cfg space */ return; - pci_write_config_dword(pdev, cfg_addr, val); + pci_write_config_dword(ap->host_set->pdev, cfg_addr, val); } static u32 sis_scr_read (struct ata_port *ap, unsigned int sc_reg)