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

Commit 16867823 authored by akpm@osdl.org's avatar akpm@osdl.org Committed by Dave Jones
Browse files

[AGPGART] Semaphore to Mutex conversion. 



Semaphore to mutex conversion.

The conversion was generated via scripts, and the result was validated
automatically via a script as well.

Signed-off-by: default avatarArjan van de Ven <arjan@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent 5dda4986

drivers/char/agp/frontend.c

+14 −14
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ static int agp_mmap(struct file *file, struct vm_area_struct *vma) 
	struct agp_file_private *priv = file->private_data;

	struct agp_kern_info kerninfo;



	down(&(agp_fe.agp_mutex));

	mutex_lock(&(agp_fe.agp_mutex));



	if (agp_fe.backend_acquired != TRUE)

		goto out_eperm;
@@ -627,7 +627,7 @@ static int agp_mmap(struct file *file, struct vm_area_struct *vma) 
					    size, vma->vm_page_prot)) {

			goto out_again;

		}

		up(&(agp_fe.agp_mutex));

		mutex_unlock(&(agp_fe.agp_mutex));

		return 0;

	}
@@ -643,20 +643,20 @@ static int agp_mmap(struct file *file, struct vm_area_struct *vma) 
					    size, vma->vm_page_prot)) {

			goto out_again;

		}

		up(&(agp_fe.agp_mutex));

		mutex_unlock(&(agp_fe.agp_mutex));

		return 0;

	}



out_eperm:

	up(&(agp_fe.agp_mutex));

	mutex_unlock(&(agp_fe.agp_mutex));

	return -EPERM;



out_inval:

	up(&(agp_fe.agp_mutex));

	mutex_unlock(&(agp_fe.agp_mutex));

	return -EINVAL;



out_again:

	up(&(agp_fe.agp_mutex));

	mutex_unlock(&(agp_fe.agp_mutex));

	return -EAGAIN;

}
@@ -664,7 +664,7 @@ static int agp_release(struct inode *inode, struct file *file) 
{

	struct agp_file_private *priv = file->private_data;



	down(&(agp_fe.agp_mutex));

	mutex_lock(&(agp_fe.agp_mutex));



	DBG("priv=%p", priv);
@@ -687,7 +687,7 @@ static int agp_release(struct inode *inode, struct file *file) 
	agp_remove_file_private(priv);

	kfree(priv);

	file->private_data = NULL;

	up(&(agp_fe.agp_mutex));

	mutex_unlock(&(agp_fe.agp_mutex));

	return 0;

}
@@ -698,7 +698,7 @@ static int agp_open(struct inode *inode, struct file *file) 
	struct agp_client *client;

	int rc = -ENXIO;



	down(&(agp_fe.agp_mutex));

	mutex_lock(&(agp_fe.agp_mutex));



	if (minor != AGPGART_MINOR)

		goto err_out;
@@ -723,13 +723,13 @@ static int agp_open(struct inode *inode, struct file *file) 
	file->private_data = (void *) priv;

	agp_insert_file_private(priv);

	DBG("private=%p, client=%p", priv, client);

	up(&(agp_fe.agp_mutex));

	mutex_unlock(&(agp_fe.agp_mutex));

	return 0;



err_out_nomem:

	rc = -ENOMEM;

err_out:

	up(&(agp_fe.agp_mutex));

	mutex_unlock(&(agp_fe.agp_mutex));

	return rc;

}
@@ -985,7 +985,7 @@ static int agp_ioctl(struct inode *inode, struct file *file, 
	int ret_val = -ENOTTY;



	DBG("priv=%p, cmd=%x", curr_priv, cmd);

	down(&(agp_fe.agp_mutex));

	mutex_lock(&(agp_fe.agp_mutex));



	if ((agp_fe.current_controller == NULL) &&

	    (cmd != AGPIOC_ACQUIRE)) {
@@ -1055,7 +1055,7 @@ static int agp_ioctl(struct inode *inode, struct file *file, 


ioctl_out:

	DBG("ioctl returns %d\n", ret_val);

	up(&(agp_fe.agp_mutex));

	mutex_unlock(&(agp_fe.agp_mutex));

	return ret_val;

}
@@ -1081,7 +1081,7 @@ static struct miscdevice agp_miscdev = 
int agp_frontend_initialize(void)

{

	memset(&agp_fe, 0, sizeof(struct agp_front_data));

	sema_init(&(agp_fe.agp_mutex), 1);

	mutex_init(&(agp_fe.agp_mutex));



	if (misc_register(&agp_miscdev)) {

		printk(KERN_ERR PFX "unable to get minor: %d\n", AGPGART_MINOR);

include/linux/agpgart.h

+2 −1
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ typedef struct _agp_unbind { 
} agp_unbind;



#else				/* __KERNEL__ */

#include <linux/mutex.h>



#define AGPGART_MINOR 175
@@ -201,7 +202,7 @@ struct agp_file_private { 
};



struct agp_front_data {

	struct semaphore agp_mutex;

	struct mutex agp_mutex;

	struct agp_controller *current_controller;

	struct agp_controller *controllers;

	struct agp_file_private *file_priv_list;