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

Commit f36d4024 authored by Aleksey Makarov's avatar Aleksey Makarov Committed by Ingo Molnar
Browse files

[PATCH] mutex subsystem, semaphore to completion: IDE ->gendev_rel_sem 



The patch changes semaphores that are initialized as
locked to complete().

Source: MontaVista Software, Inc.

Modified-by: default avatarSteven Rostedt <rostedt@goodmis.org>

The following patch is from Montavista.  I modified it slightly.
Semaphores are currently being used where it makes more sense for
completions.  This patch corrects that.

Signed-off-by: default avatarAleksey Makarov <amakarov@ru.mvista.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3fe0c277

drivers/ide/ide-probe.c

+2 −2
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ static void hwif_release_dev (struct device *dev) 
{

	ide_hwif_t *hwif = container_of(dev, ide_hwif_t, gendev);



	up(&hwif->gendev_rel_sem);

	complete(&hwif->gendev_rel_comp);

}



static void hwif_register (ide_hwif_t *hwif)
@@ -1327,7 +1327,7 @@ static void drive_release_dev (struct device *dev) 
	drive->queue = NULL;

	spin_unlock_irq(&ide_lock);



	up(&drive->gendev_rel_sem);

	complete(&drive->gendev_rel_comp);

}



/*

drivers/ide/ide.c

+4 −4
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static void init_hwif_data(ide_hwif_t *hwif, unsigned int index) 
	hwif->mwdma_mask = 0x80;	/* disable all mwdma */

	hwif->swdma_mask = 0x80;	/* disable all swdma */



	sema_init(&hwif->gendev_rel_sem, 0);

	init_completion(&hwif->gendev_rel_comp);



	default_hwif_iops(hwif);

	default_hwif_transport(hwif);
@@ -245,7 +245,7 @@ static void init_hwif_data(ide_hwif_t *hwif, unsigned int index) 
		drive->is_flash			= 0;

		drive->vdma			= 0;

		INIT_LIST_HEAD(&drive->list);

		sema_init(&drive->gendev_rel_sem, 0);

		init_completion(&drive->gendev_rel_comp);

	}

}
@@ -602,7 +602,7 @@ void ide_unregister(unsigned int index) 
		}

		spin_unlock_irq(&ide_lock);

		device_unregister(&drive->gendev);

		down(&drive->gendev_rel_sem);

		wait_for_completion(&drive->gendev_rel_comp);

		spin_lock_irq(&ide_lock);

	}

	hwif->present = 0;
@@ -662,7 +662,7 @@ void ide_unregister(unsigned int index) 
	/* More messed up locking ... */

	spin_unlock_irq(&ide_lock);

	device_unregister(&hwif->gendev);

	down(&hwif->gendev_rel_sem);

	wait_for_completion(&hwif->gendev_rel_comp);



	/*

	 * Remove us from the kernel's knowledge

include/linux/ide.h

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/bio.h>

#include <linux/device.h>

#include <linux/pci.h>

#include <linux/completion.h>

#include <asm/byteorder.h>

#include <asm/system.h>

#include <asm/io.h>
@@ -638,7 +639,7 @@ typedef struct ide_drive_s { 
	int		crc_count;	/* crc counter to reduce drive speed */

	struct list_head list;

	struct device	gendev;

	struct semaphore gendev_rel_sem;	/* to deal with device release() */

	struct completion gendev_rel_comp;	/* to deal with device release() */

} ide_drive_t;



#define to_ide_device(dev)container_of(dev, ide_drive_t, gendev)
@@ -794,7 +795,7 @@ typedef struct hwif_s { 
	unsigned	sg_mapped  : 1;	/* sg_table and sg_nents are ready */



	struct device	gendev;

	struct semaphore gendev_rel_sem; /* To deal with device release() */

	struct completion gendev_rel_comp; /* To deal with device release() */



	void		*hwif_data;	/* extra hwif data */