git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[AGPGART] Further constification.
[pandora-kernel.git]
/
drivers
/
char
/
agp
/
ati-agp.c
diff --git
a/drivers/char/agp/ati-agp.c
b/drivers/char/agp/ati-agp.c
index
f244c66
..
780e59e
100644
(file)
--- a/
drivers/char/agp/ati-agp.c
+++ b/
drivers/char/agp/ati-agp.c
@@
-24,7
+24,7
@@
#define ATI_GART_CACHE_ENTRY_CNTRL 0x10
#define ATI_GART_CACHE_ENTRY_CNTRL 0x10
-static struct aper_size_info_lvl2 ati_generic_sizes[7] =
+static
const
struct aper_size_info_lvl2 ati_generic_sizes[7] =
{
{2048, 524288, 0x0000000c},
{1024, 262144, 0x0000000a},
{
{2048, 524288, 0x0000000c},
{1024, 262144, 0x0000000a},
@@
-41,18
+41,18
@@
static struct gatt_mask ati_generic_masks[] =
};
};
-
typedef struct _
ati_page_map {
+
struct
ati_page_map {
unsigned long *real;
unsigned long __iomem *remapped;
unsigned long *real;
unsigned long __iomem *remapped;
-}
ati_page_map
;
+};
static struct _ati_generic_private {
volatile u8 __iomem *registers;
static struct _ati_generic_private {
volatile u8 __iomem *registers;
- ati_page_map **gatt_pages;
+
struct
ati_page_map **gatt_pages;
int num_tables;
} ati_generic_private;
int num_tables;
} ati_generic_private;
-static int ati_create_page_map(ati_page_map *page_map)
+static int ati_create_page_map(
struct
ati_page_map *page_map)
{
int i, err = 0;
{
int i, err = 0;
@@
-82,7
+82,7
@@
static int ati_create_page_map(ati_page_map *page_map)
}
}
-static void ati_free_page_map(ati_page_map *page_map)
+static void ati_free_page_map(
struct
ati_page_map *page_map)
{
unmap_page_from_agp(virt_to_page(page_map->real));
iounmap(page_map->remapped);
{
unmap_page_from_agp(virt_to_page(page_map->real));
iounmap(page_map->remapped);
@@
-94,8
+94,8
@@
static void ati_free_page_map(ati_page_map *page_map)
static void ati_free_gatt_pages(void)
{
int i;
static void ati_free_gatt_pages(void)
{
int i;
- ati_page_map **tables;
- ati_page_map *entry;
+
struct
ati_page_map **tables;
+
struct
ati_page_map *entry;
tables = ati_generic_private.gatt_pages;
for (i = 0; i < ati_generic_private.num_tables; i++) {
tables = ati_generic_private.gatt_pages;
for (i = 0; i < ati_generic_private.num_tables; i++) {
@@
-112,30
+112,30
@@
static void ati_free_gatt_pages(void)
static int ati_create_gatt_pages(int nr_tables)
{
static int ati_create_gatt_pages(int nr_tables)
{
- ati_page_map **tables;
- ati_page_map *entry;
+
struct
ati_page_map **tables;
+
struct
ati_page_map *entry;
int retval = 0;
int i;
int retval = 0;
int i;
- tables = kzalloc((nr_tables + 1) * sizeof(ati_page_map *),GFP_KERNEL);
+ tables = kzalloc((nr_tables + 1) * sizeof(
struct
ati_page_map *),GFP_KERNEL);
if (tables == NULL)
return -ENOMEM;
for (i = 0; i < nr_tables; i++) {
if (tables == NULL)
return -ENOMEM;
for (i = 0; i < nr_tables; i++) {
- entry = kzalloc(sizeof(ati_page_map), GFP_KERNEL);
+ entry = kzalloc(sizeof(
struct
ati_page_map), GFP_KERNEL);
if (entry == NULL) {
if (entry == NULL) {
- while (i
>
0) {
- kfree
(tables[i-1]);
+ while (i
>
0) {
+ kfree(tables[i-1]);
i--;
}
i--;
}
- kfree (tables);
- tables = NULL;
+ kfree(tables);
retval = -ENOMEM;
break;
}
tables[i] = entry;
retval = ati_create_page_map(entry);
retval = -ENOMEM;
break;
}
tables[i] = entry;
retval = ati_create_page_map(entry);
- if (retval != 0) break;
+ if (retval != 0)
+ break;
}
ati_generic_private.num_tables = nr_tables;
ati_generic_private.gatt_pages = tables;
}
ati_generic_private.num_tables = nr_tables;
ati_generic_private.gatt_pages = tables;
@@
-340,7
+340,7
@@
static int ati_remove_memory(struct agp_memory * mem, off_t pg_start,
static int ati_create_gatt_table(struct agp_bridge_data *bridge)
{
struct aper_size_info_lvl2 *value;
static int ati_create_gatt_table(struct agp_bridge_data *bridge)
{
struct aper_size_info_lvl2 *value;
- ati_page_map page_dir;
+
struct
ati_page_map page_dir;
unsigned long addr;
int retval;
u32 temp;
unsigned long addr;
int retval;
u32 temp;
@@
-400,7
+400,7
@@
static int ati_create_gatt_table(struct agp_bridge_data *bridge)
static int ati_free_gatt_table(struct agp_bridge_data *bridge)
{
static int ati_free_gatt_table(struct agp_bridge_data *bridge)
{
- ati_page_map page_dir;
+
struct
ati_page_map page_dir;
page_dir.real = (unsigned long *)agp_bridge->gatt_table_real;
page_dir.remapped = (unsigned long __iomem *)agp_bridge->gatt_table;
page_dir.real = (unsigned long *)agp_bridge->gatt_table_real;
page_dir.remapped = (unsigned long __iomem *)agp_bridge->gatt_table;
@@
-410,7
+410,7
@@
static int ati_free_gatt_table(struct agp_bridge_data *bridge)
return 0;
}
return 0;
}
-static struct agp_bridge_driver ati_generic_bridge = {
+static
const
struct agp_bridge_driver ati_generic_bridge = {
.owner = THIS_MODULE,
.aperture_sizes = ati_generic_sizes,
.size_type = LVL2_APER_SIZE,
.owner = THIS_MODULE,
.aperture_sizes = ati_generic_sizes,
.size_type = LVL2_APER_SIZE,
@@
-431,6
+431,7
@@
static struct agp_bridge_driver ati_generic_bridge = {
.free_by_type = agp_generic_free_by_type,
.agp_alloc_page = agp_generic_alloc_page,
.agp_destroy_page = agp_generic_destroy_page,
.free_by_type = agp_generic_free_by_type,
.agp_alloc_page = agp_generic_alloc_page,
.agp_destroy_page = agp_generic_destroy_page,
+ .agp_type_to_mask_type = agp_generic_type_to_mask_type,
};
};