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

Commit 36501650 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: keep pointer to struct device instead of struct pci_dev in ide_hwif_t 



Keep pointer to struct device instead of struct pci_dev in ide_hwif_t.

While on it:
* Use *dev->dma_mask instead of pci_dev->dma_mask in ide_toggle_bounce().

There should be no functionality changes caused by this patch.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent f6fb786d

drivers/ide/ide-dma.c

+13 −10
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ static int ide_dma_good_drive(ide_drive_t *drive) 
int ide_build_sglist(ide_drive_t *drive, struct request *rq)

{

	ide_hwif_t *hwif = HWIF(drive);

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

	struct scatterlist *sg = hwif->sg_table;



	ide_map_sg(drive, rq);
@@ -193,7 +194,7 @@ int ide_build_sglist(ide_drive_t *drive, struct request *rq) 
	else

		hwif->sg_dma_direction = PCI_DMA_TODEVICE;



	return pci_map_sg(hwif->pci_dev, sg, hwif->sg_nents, hwif->sg_dma_direction);

	return pci_map_sg(pdev, sg, hwif->sg_nents, hwif->sg_dma_direction);

}



EXPORT_SYMBOL_GPL(ide_build_sglist);
@@ -306,11 +307,11 @@ EXPORT_SYMBOL_GPL(ide_build_dmatable); 
 

void ide_destroy_dmatable (ide_drive_t *drive)

{

	struct pci_dev *dev = HWIF(drive)->pci_dev;

	struct scatterlist *sg = HWIF(drive)->sg_table;

	int nents = HWIF(drive)->sg_nents;

	ide_hwif_t *hwif = drive->hwif;

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



	pci_unmap_sg(dev, sg, nents, HWIF(drive)->sg_dma_direction);

	pci_unmap_sg(pdev, hwif->sg_table, hwif->sg_nents,

		     hwif->sg_dma_direction);

}



EXPORT_SYMBOL_GPL(ide_destroy_dmatable);
@@ -843,10 +844,10 @@ EXPORT_SYMBOL(ide_dma_timeout); 
static void ide_release_dma_engine(ide_hwif_t *hwif)

{

	if (hwif->dmatable_cpu) {

		pci_free_consistent(hwif->pci_dev,

				    PRD_ENTRIES * PRD_BYTES,

				    hwif->dmatable_cpu,

				    hwif->dmatable_dma);

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



		pci_free_consistent(pdev, PRD_ENTRIES * PRD_BYTES,

				    hwif->dmatable_cpu, hwif->dmatable_dma);

		hwif->dmatable_cpu = NULL;

	}

}
@@ -874,7 +875,9 @@ int ide_release_dma(ide_hwif_t *hwif) 


static int ide_allocate_dma_engine(ide_hwif_t *hwif)

{

	hwif->dmatable_cpu = pci_alloc_consistent(hwif->pci_dev,

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



	hwif->dmatable_cpu = pci_alloc_consistent(pdev,

						  PRD_ENTRIES * PRD_BYTES,

						  &hwif->dmatable_dma);

drivers/ide/ide-lib.c

+4 −2
Original line number Diff line number Diff line
@@ -358,8 +358,10 @@ void ide_toggle_bounce(ide_drive_t *drive, int on) 
	if (!PCI_DMA_BUS_IS_PHYS) {

		addr = BLK_BOUNCE_ANY;

	} else if (on && drive->media == ide_disk) {

		if (HWIF(drive)->pci_dev)

			addr = HWIF(drive)->pci_dev->dma_mask;

		struct device *dev = drive->hwif->dev;



		if (dev && dev->dma_mask)

			addr = *dev->dma_mask;

	}



	if (drive->queue)

drivers/ide/ide-probe.c

+2 −2
Original line number Diff line number Diff line
@@ -622,8 +622,8 @@ static void hwif_register (ide_hwif_t *hwif) 
	strlcpy(hwif->gendev.bus_id,hwif->name,BUS_ID_SIZE);

	hwif->gendev.driver_data = hwif;

	if (hwif->gendev.parent == NULL) {

		if (hwif->pci_dev)

			hwif->gendev.parent = &hwif->pci_dev->dev;

		if (hwif->dev)

			hwif->gendev.parent = hwif->dev;

		else

			/* Would like to do = &device_legacy */

			hwif->gendev.parent = NULL;

drivers/ide/ide.c

+2 −1
Original line number Diff line number Diff line
@@ -405,8 +405,9 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif) 
	hwif->chipset			= tmp_hwif->chipset;

	hwif->hold			= tmp_hwif->hold;



	hwif->dev			= tmp_hwif->dev;



#ifdef CONFIG_BLK_DEV_IDEPCI

	hwif->pci_dev			= tmp_hwif->pci_dev;

	hwif->cds			= tmp_hwif->cds;

#endif

drivers/ide/pci/aec62xx.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

	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;
@@ -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);

	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;
@@ -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)

{

	struct pci_dev *dev	= hwif->pci_dev;

	struct pci_dev *dev = to_pci_dev(hwif->dev);



	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;



		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;

	}