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

ide: use ide_remove_port_from_hwgroup in init_irq() 



There should be no functionality changes caused by this patch.

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

drivers/ide/ide-probe.c

+1 −17
Original line number Diff line number Diff line
@@ -1074,23 +1074,7 @@ static int init_irq (ide_hwif_t *hwif) 
	mutex_unlock(&ide_cfg_mtx);

	return 0;

out_unlink:

	spin_lock_irq(&ide_lock);

	if (hwif->next == hwif) {

		BUG_ON(hwgroup->hwif != hwif);

		kfree(hwgroup);

	} else {

		ide_hwif_t *g;

		g = hwgroup->hwif;

		while (g->next != hwif)

			g = g->next;

		g->next = hwif->next;

		if (hwgroup->hwif == hwif) {

			BUG_ON(hwgroup->drive);

			hwgroup->hwif = g;

		}

		BUG_ON(hwgroup->hwif == hwif);

	}

	spin_unlock_irq(&ide_lock);

	ide_remove_port_from_hwgroup(hwif);

out_up:

	mutex_unlock(&ide_cfg_mtx);

	return 1;

drivers/ide/ide.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif) 
	hwif->hwif_data			= tmp_hwif->hwif_data;

}



static void ide_remove_port_from_hwgroup(ide_hwif_t *hwif)

void ide_remove_port_from_hwgroup(ide_hwif_t *hwif)

{

	ide_hwgroup_t *hwgroup = hwif->hwgroup;

include/linux/ide.h

+1 −0
Original line number Diff line number Diff line
@@ -1191,6 +1191,7 @@ static inline void ide_acpi_init(ide_hwif_t *hwif) { ; } 
static inline void ide_acpi_set_state(ide_hwif_t *hwif, int on) {}

#endif



void ide_remove_port_from_hwgroup(ide_hwif_t *);

extern int ide_hwif_request_regions(ide_hwif_t *hwif);

extern void ide_hwif_release_regions(ide_hwif_t* hwif);

extern void ide_unregister (unsigned int index);