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

Commit 9516b030 authored by Dave Airlie's avatar Dave Airlie
Browse files

agp: more boolean conversions. 



Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent c7258012

drivers/char/agp/compat_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		ret_val = -EINVAL;

		goto ioctl_out;

	}

	if ((agp_fe.backend_acquired != TRUE) &&

	if ((agp_fe.backend_acquired != true) &&

	    (cmd != AGPIOC_ACQUIRE32)) {

		ret_val = -EBUSY;

		goto ioctl_out;

drivers/char/agp/frontend.c

+6 −6
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static int agp_remove_controller(struct agp_controller *controller) 


	if (agp_fe.current_controller == controller) {

		agp_fe.current_controller = NULL;

		agp_fe.backend_acquired = FALSE;

		agp_fe.backend_acquired = false;

		agp_backend_release(agp_bridge);

	}

	kfree(controller);
@@ -443,7 +443,7 @@ static void agp_controller_release_current(struct agp_controller *controller, 
	}



	agp_fe.current_controller = NULL;

	agp_fe.used_by_controller = FALSE;

	agp_fe.used_by_controller = false;

	agp_backend_release(agp_bridge);

}
@@ -573,7 +573,7 @@ static int agp_mmap(struct file *file, struct vm_area_struct *vma) 


	mutex_lock(&(agp_fe.agp_mutex));



	if (agp_fe.backend_acquired != TRUE)

	if (agp_fe.backend_acquired != true)

		goto out_eperm;



	if (!(test_bit(AGP_FF_IS_VALID, &priv->access_flags)))
@@ -768,7 +768,7 @@ int agpioc_acquire_wrap(struct agp_file_private *priv) 


	atomic_inc(&agp_bridge->agp_in_use);



	agp_fe.backend_acquired = TRUE;

	agp_fe.backend_acquired = true;



	controller = agp_find_controller_by_pid(priv->my_pid);
@@ -778,7 +778,7 @@ int agpioc_acquire_wrap(struct agp_file_private *priv) 
		controller = agp_create_controller(priv->my_pid);



		if (controller == NULL) {

			agp_fe.backend_acquired = FALSE;

			agp_fe.backend_acquired = false;

			agp_backend_release(agp_bridge);

			return -ENOMEM;

		}
@@ -981,7 +981,7 @@ static long agp_ioctl(struct file *file, 
		ret_val = -EINVAL;

		goto ioctl_out;

	}

	if ((agp_fe.backend_acquired != TRUE) &&

	if ((agp_fe.backend_acquired != true) &&

	    (cmd != AGPIOC_ACQUIRE)) {

		ret_val = -EBUSY;

		goto ioctl_out;

drivers/char/agp/generic.c

+2 −2
Original line number Diff line number Diff line
@@ -96,13 +96,13 @@ EXPORT_SYMBOL(agp_flush_chipset); 
void agp_alloc_page_array(size_t size, struct agp_memory *mem)

{

	mem->memory = NULL;

	mem->vmalloc_flag = 0;

	mem->vmalloc_flag = false;



	if (size <= 2*PAGE_SIZE)

		mem->memory = kmalloc(size, GFP_KERNEL | __GFP_NORETRY);

	if (mem->memory == NULL) {

		mem->memory = vmalloc(size);

		mem->vmalloc_flag = 1;

		mem->vmalloc_flag = true;

	}

}

EXPORT_SYMBOL(agp_alloc_page_array);

drivers/char/agp/intel-agp.c

+3 −3
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static int intel_i810_insert_entries(struct agp_memory *mem, off_t pg_start, 
out:

	ret = 0;

out_err:

	mem->is_flushed = 1;

	mem->is_flushed = true;

	return ret;

}
@@ -795,7 +795,7 @@ static int intel_i830_insert_entries(struct agp_memory *mem, off_t pg_start, 
out:

	ret = 0;

out_err:

	mem->is_flushed = 1;

	mem->is_flushed = true;

	return ret;

}
@@ -1022,7 +1022,7 @@ static int intel_i915_insert_entries(struct agp_memory *mem, off_t pg_start, 
 out:

	ret = 0;

 out_err:

	mem->is_flushed = 1;

	mem->is_flushed = true;

	return ret;

}

include/linux/agp_backend.h

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ struct agp_memory { 
	u32 physical;

	bool is_bound;

	bool is_flushed;

        u8 vmalloc_flag;

        bool vmalloc_flag;

};



#define AGP_NORMAL_MEMORY 0