Commit c24ba0f3 authored by Jeff Garzik's avatar Jeff Garzik

Misc warning fixes:

* block/cciss: eliminate "comparison always false" warning
* char/agp/amd64-agp: properly suffix 64-bit constants
* ide/legacy/pdc4030: fix incomplete conversion to new IDE module API
parent 849f7820
...@@ -636,9 +636,11 @@ static int cciss_ioctl(struct inode *inode, struct file *filep, ...@@ -636,9 +636,11 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
{ {
return -EINVAL; return -EINVAL;
} }
#if 0 /* 'buf_size' member is 16-bits, and always smaller than kmalloc limit */
/* Check kmalloc limits */ /* Check kmalloc limits */
if(iocommand.buf_size > 128000) if(iocommand.buf_size > 128000)
return -EINVAL; return -EINVAL;
#endif
if(iocommand.buf_size > 0) if(iocommand.buf_size > 0)
{ {
buff = kmalloc(iocommand.buf_size, GFP_KERNEL); buff = kmalloc(iocommand.buf_size, GFP_KERNEL);
......
...@@ -91,9 +91,9 @@ static int amd64_insert_memory(struct agp_memory *mem, off_t pg_start, int type) ...@@ -91,9 +91,9 @@ static int amd64_insert_memory(struct agp_memory *mem, off_t pg_start, int type)
for (i = 0, j = pg_start; i < mem->page_count; i++, j++) { for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
tmp = agp_bridge->driver->mask_memory(mem->memory[i], mem->type); tmp = agp_bridge->driver->mask_memory(mem->memory[i], mem->type);
BUG_ON(tmp & 0xffffff0000000ffc); BUG_ON(tmp & 0xffffff0000000ffcULL);
pte = (tmp & 0x000000ff00000000) >> 28; pte = (tmp & 0x000000ff00000000ULL) >> 28;
pte |=(tmp & 0x00000000fffff000); pte |=(tmp & 0x00000000fffff000ULL);
pte |= GPTE_VALID | GPTE_COHERENT; pte |= GPTE_VALID | GPTE_COHERENT;
agp_bridge->gatt_table[j] = pte; agp_bridge->gatt_table[j] = pte;
......
...@@ -304,22 +304,16 @@ int __init ide_probe_for_pdc4030(void) ...@@ -304,22 +304,16 @@ int __init ide_probe_for_pdc4030(void)
#ifndef MODULE #ifndef MODULE
if (enable_promise_support == 0) if (enable_promise_support == 0)
return; return 0;
#endif #endif
for (index = 0; index < MAX_HWIFS; index++) { for (index = 0; index < MAX_HWIFS; index++) {
hwif = &ide_hwifs[index]; hwif = &ide_hwifs[index];
if (hwif->chipset == ide_unknown && detect_pdc4030(hwif)) { if (hwif->chipset == ide_unknown && detect_pdc4030(hwif))
#ifndef MODULE
setup_pdc4030(hwif);
#else
return setup_pdc4030(hwif); return setup_pdc4030(hwif);
#endif
}
} }
#ifdef MODULE
return 0; return 0;
#endif
} }
static void __exit release_pdc4030(ide_hwif_t *hwif, ide_hwif_t *mate) static void __exit release_pdc4030(ide_hwif_t *hwif, ide_hwif_t *mate)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment