Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
9516b030
Commit
9516b030
authored
Jun 19, 2008
by
Dave Airlie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
agp: more boolean conversions.
Signed-off-by:
Dave Airlie
<
airlied@redhat.com
>
parent
c7258012
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
15 deletions
+15
-15
drivers/char/agp/compat_ioctl.c
drivers/char/agp/compat_ioctl.c
+1
-1
drivers/char/agp/frontend.c
drivers/char/agp/frontend.c
+6
-6
drivers/char/agp/generic.c
drivers/char/agp/generic.c
+2
-2
drivers/char/agp/intel-agp.c
drivers/char/agp/intel-agp.c
+3
-3
include/linux/agp_backend.h
include/linux/agp_backend.h
+1
-1
include/linux/agpgart.h
include/linux/agpgart.h
+2
-2
No files found.
drivers/char/agp/compat_ioctl.c
View file @
9516b030
...
@@ -214,7 +214,7 @@ long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
...
@@ -214,7 +214,7 @@ long compat_agp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
ret_val
=
-
EINVAL
;
ret_val
=
-
EINVAL
;
goto
ioctl_out
;
goto
ioctl_out
;
}
}
if
((
agp_fe
.
backend_acquired
!=
TRUE
)
&&
if
((
agp_fe
.
backend_acquired
!=
true
)
&&
(
cmd
!=
AGPIOC_ACQUIRE32
))
{
(
cmd
!=
AGPIOC_ACQUIRE32
))
{
ret_val
=
-
EBUSY
;
ret_val
=
-
EBUSY
;
goto
ioctl_out
;
goto
ioctl_out
;
...
...
drivers/char/agp/frontend.c
View file @
9516b030
...
@@ -395,7 +395,7 @@ static int agp_remove_controller(struct agp_controller *controller)
...
@@ -395,7 +395,7 @@ static int agp_remove_controller(struct agp_controller *controller)
if
(
agp_fe
.
current_controller
==
controller
)
{
if
(
agp_fe
.
current_controller
==
controller
)
{
agp_fe
.
current_controller
=
NULL
;
agp_fe
.
current_controller
=
NULL
;
agp_fe
.
backend_acquired
=
FALSE
;
agp_fe
.
backend_acquired
=
false
;
agp_backend_release
(
agp_bridge
);
agp_backend_release
(
agp_bridge
);
}
}
kfree
(
controller
);
kfree
(
controller
);
...
@@ -443,7 +443,7 @@ static void agp_controller_release_current(struct agp_controller *controller,
...
@@ -443,7 +443,7 @@ static void agp_controller_release_current(struct agp_controller *controller,
}
}
agp_fe
.
current_controller
=
NULL
;
agp_fe
.
current_controller
=
NULL
;
agp_fe
.
used_by_controller
=
FALSE
;
agp_fe
.
used_by_controller
=
false
;
agp_backend_release
(
agp_bridge
);
agp_backend_release
(
agp_bridge
);
}
}
...
@@ -573,7 +573,7 @@ static int agp_mmap(struct file *file, struct vm_area_struct *vma)
...
@@ -573,7 +573,7 @@ static int agp_mmap(struct file *file, struct vm_area_struct *vma)
mutex_lock
(
&
(
agp_fe
.
agp_mutex
));
mutex_lock
(
&
(
agp_fe
.
agp_mutex
));
if
(
agp_fe
.
backend_acquired
!=
TRUE
)
if
(
agp_fe
.
backend_acquired
!=
true
)
goto
out_eperm
;
goto
out_eperm
;
if
(
!
(
test_bit
(
AGP_FF_IS_VALID
,
&
priv
->
access_flags
)))
if
(
!
(
test_bit
(
AGP_FF_IS_VALID
,
&
priv
->
access_flags
)))
...
@@ -768,7 +768,7 @@ int agpioc_acquire_wrap(struct agp_file_private *priv)
...
@@ -768,7 +768,7 @@ int agpioc_acquire_wrap(struct agp_file_private *priv)
atomic_inc
(
&
agp_bridge
->
agp_in_use
);
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
);
controller
=
agp_find_controller_by_pid
(
priv
->
my_pid
);
...
@@ -778,7 +778,7 @@ int agpioc_acquire_wrap(struct agp_file_private *priv)
...
@@ -778,7 +778,7 @@ int agpioc_acquire_wrap(struct agp_file_private *priv)
controller
=
agp_create_controller
(
priv
->
my_pid
);
controller
=
agp_create_controller
(
priv
->
my_pid
);
if
(
controller
==
NULL
)
{
if
(
controller
==
NULL
)
{
agp_fe
.
backend_acquired
=
FALSE
;
agp_fe
.
backend_acquired
=
false
;
agp_backend_release
(
agp_bridge
);
agp_backend_release
(
agp_bridge
);
return
-
ENOMEM
;
return
-
ENOMEM
;
}
}
...
@@ -981,7 +981,7 @@ static long agp_ioctl(struct file *file,
...
@@ -981,7 +981,7 @@ static long agp_ioctl(struct file *file,
ret_val
=
-
EINVAL
;
ret_val
=
-
EINVAL
;
goto
ioctl_out
;
goto
ioctl_out
;
}
}
if
((
agp_fe
.
backend_acquired
!=
TRUE
)
&&
if
((
agp_fe
.
backend_acquired
!=
true
)
&&
(
cmd
!=
AGPIOC_ACQUIRE
))
{
(
cmd
!=
AGPIOC_ACQUIRE
))
{
ret_val
=
-
EBUSY
;
ret_val
=
-
EBUSY
;
goto
ioctl_out
;
goto
ioctl_out
;
...
...
drivers/char/agp/generic.c
View file @
9516b030
...
@@ -96,13 +96,13 @@ EXPORT_SYMBOL(agp_flush_chipset);
...
@@ -96,13 +96,13 @@ EXPORT_SYMBOL(agp_flush_chipset);
void
agp_alloc_page_array
(
size_t
size
,
struct
agp_memory
*
mem
)
void
agp_alloc_page_array
(
size_t
size
,
struct
agp_memory
*
mem
)
{
{
mem
->
memory
=
NULL
;
mem
->
memory
=
NULL
;
mem
->
vmalloc_flag
=
0
;
mem
->
vmalloc_flag
=
false
;
if
(
size
<=
2
*
PAGE_SIZE
)
if
(
size
<=
2
*
PAGE_SIZE
)
mem
->
memory
=
kmalloc
(
size
,
GFP_KERNEL
|
__GFP_NORETRY
);
mem
->
memory
=
kmalloc
(
size
,
GFP_KERNEL
|
__GFP_NORETRY
);
if
(
mem
->
memory
==
NULL
)
{
if
(
mem
->
memory
==
NULL
)
{
mem
->
memory
=
vmalloc
(
size
);
mem
->
memory
=
vmalloc
(
size
);
mem
->
vmalloc_flag
=
1
;
mem
->
vmalloc_flag
=
true
;
}
}
}
}
EXPORT_SYMBOL
(
agp_alloc_page_array
);
EXPORT_SYMBOL
(
agp_alloc_page_array
);
...
...
drivers/char/agp/intel-agp.c
View file @
9516b030
...
@@ -325,7 +325,7 @@ static int intel_i810_insert_entries(struct agp_memory *mem, off_t pg_start,
...
@@ -325,7 +325,7 @@ static int intel_i810_insert_entries(struct agp_memory *mem, off_t pg_start,
out:
out:
ret
=
0
;
ret
=
0
;
out_err:
out_err:
mem
->
is_flushed
=
1
;
mem
->
is_flushed
=
true
;
return
ret
;
return
ret
;
}
}
...
@@ -795,7 +795,7 @@ static int intel_i830_insert_entries(struct agp_memory *mem, off_t pg_start,
...
@@ -795,7 +795,7 @@ static int intel_i830_insert_entries(struct agp_memory *mem, off_t pg_start,
out:
out:
ret
=
0
;
ret
=
0
;
out_err:
out_err:
mem
->
is_flushed
=
1
;
mem
->
is_flushed
=
true
;
return
ret
;
return
ret
;
}
}
...
@@ -1022,7 +1022,7 @@ static int intel_i915_insert_entries(struct agp_memory *mem, off_t pg_start,
...
@@ -1022,7 +1022,7 @@ static int intel_i915_insert_entries(struct agp_memory *mem, off_t pg_start,
out:
out:
ret
=
0
;
ret
=
0
;
out_err:
out_err:
mem
->
is_flushed
=
1
;
mem
->
is_flushed
=
true
;
return
ret
;
return
ret
;
}
}
...
...
include/linux/agp_backend.h
View file @
9516b030
...
@@ -77,7 +77,7 @@ struct agp_memory {
...
@@ -77,7 +77,7 @@ struct agp_memory {
u32
physical
;
u32
physical
;
bool
is_bound
;
bool
is_bound
;
bool
is_flushed
;
bool
is_flushed
;
u8
vmalloc_flag
;
bool
vmalloc_flag
;
};
};
#define AGP_NORMAL_MEMORY 0
#define AGP_NORMAL_MEMORY 0
...
...
include/linux/agpgart.h
View file @
9516b030
...
@@ -206,8 +206,8 @@ struct agp_front_data {
...
@@ -206,8 +206,8 @@ struct agp_front_data {
struct
agp_controller
*
current_controller
;
struct
agp_controller
*
current_controller
;
struct
agp_controller
*
controllers
;
struct
agp_controller
*
controllers
;
struct
agp_file_private
*
file_priv_list
;
struct
agp_file_private
*
file_priv_list
;
u8
used_by_controller
;
bool
used_by_controller
;
u8
backend_acquired
;
bool
backend_acquired
;
};
};
#endif
/* __KERNEL__ */
#endif
/* __KERNEL__ */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment