Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8add7885 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata] minor fixes 

* sata_mv: remove pci_intx(), now that the same function is in PCI core
* sata_sis: fix variable initialization bug, trim trailing whitespace
parent 03981f24

drivers/scsi/sata_mv.c

+0 −16
Original line number Diff line number Diff line
@@ -699,22 +699,6 @@ static int mv_host_init(struct ata_probe_ent *probe_ent) 
	return rc;

}



/* move to PCI layer, integrate w/ MSI stuff */

static void pci_intx(struct pci_dev *pdev, int enable)

{

	u16 pci_command, new;



	pci_read_config_word(pdev, PCI_COMMAND, &pci_command);



	if (enable)

		new = pci_command & ~PCI_COMMAND_INTX_DISABLE;

	else

		new = pci_command | PCI_COMMAND_INTX_DISABLE;



	if (new != pci_command)

		pci_write_config_word(pdev, PCI_COMMAND, pci_command);

}



static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	static int printed_version = 0;

drivers/scsi/sata_sis.c

+11 −9
Original line number Diff line number Diff line
@@ -147,11 +147,13 @@ static unsigned int get_scr_cfg_addr(unsigned int port_no, unsigned int sc_reg, 
{

	unsigned int addr = SIS_SCR_BASE + (4 * sc_reg);



	if (port_no) 

	if (port_no)  {

		if (device == 0x182)

			addr += SIS182_SATA1_OFS;

		else

			addr += SIS180_SATA1_OFS;

	}



	return addr;

}
@@ -195,7 +197,7 @@ static void sis_scr_cfg_write (struct ata_port *ap, unsigned int scr, u32 val) 
static u32 sis_scr_read (struct ata_port *ap, unsigned int sc_reg)

{

	struct pci_dev *pdev = to_pci_dev(ap->host_set->dev);

	u32 val,val2;

	u32 val, val2 = 0;

	u8 pmr;



	if (sc_reg > SCR_CONTROL)