Commit e13c6d36 authored by Jesse Barnes's avatar Jesse Barnes Committed by David Mosberger

[PATCH] ia64: fix misc. sn2 warnings

This patch fixes a few warnings that have cropped up in the sn2 code:
  - hwgfs function prototype mismatch
  - pconn uninitialized in pciio.c
  - printk formatting fixes in pcibr_dvr.c
  - kill volatile qualifier in pcibr_intr.c
parent 4aec3a86
...@@ -84,7 +84,7 @@ static int hwgfs_mkdir(struct inode * dir, struct dentry * dentry, int mode) ...@@ -84,7 +84,7 @@ static int hwgfs_mkdir(struct inode * dir, struct dentry * dentry, int mode)
return hwgfs_mknod(dir, dentry, mode | S_IFDIR, 0); return hwgfs_mknod(dir, dentry, mode | S_IFDIR, 0);
} }
static int hwgfs_create(struct inode *dir, struct dentry *dentry, int mode) static int hwgfs_create(struct inode *dir, struct dentry *dentry, int mode, struct nameidata *unused)
{ {
return hwgfs_mknod(dir, dentry, mode | S_IFREG, 0); return hwgfs_mknod(dir, dentry, mode | S_IFREG, 0);
} }
......
...@@ -2501,7 +2501,7 @@ pcibr_pcix_rbars_calc(pcibr_soft_t pcibr_soft) ...@@ -2501,7 +2501,7 @@ pcibr_pcix_rbars_calc(pcibr_soft_t pcibr_soft)
if (pcibr_soft->bs_pcix_num_funcs) { if (pcibr_soft->bs_pcix_num_funcs) {
if (pcibr_soft->bs_pcix_num_funcs > NUM_RBAR) { if (pcibr_soft->bs_pcix_num_funcs > NUM_RBAR) {
printk(KERN_WARNING printk(KERN_WARNING
"%lx: Must oversubscribe Read Buffer Attribute Registers" "%s: Must oversubscribe Read Buffer Attribute Registers"
"(RBAR). Bus has %d RBARs but %d funcs need them.\n", "(RBAR). Bus has %d RBARs but %d funcs need them.\n",
pcibr_soft->bs_name, NUM_RBAR, pcibr_soft->bs_pcix_num_funcs); pcibr_soft->bs_name, NUM_RBAR, pcibr_soft->bs_pcix_num_funcs);
percent_allowed = 0; percent_allowed = 0;
...@@ -2603,7 +2603,7 @@ pcibr_debug(uint32_t type, vertex_hdl_t vhdl, char *format, ...) ...@@ -2603,7 +2603,7 @@ pcibr_debug(uint32_t type, vertex_hdl_t vhdl, char *format, ...)
memset(buffer, 0, 1024); memset(buffer, 0, 1024);
vsnprintf(buffer, 1024, format, ap); vsnprintf(buffer, 1024, format, ap);
va_end(ap); va_end(ap);
printk("", "%s", buffer); printk("%s", buffer);
kfree(buffer); kfree(buffer);
} }
} }
......
...@@ -101,7 +101,7 @@ sn_dma_flush(unsigned long addr) ...@@ -101,7 +101,7 @@ sn_dma_flush(unsigned long addr)
{ {
nasid_t nasid; nasid_t nasid;
int wid_num; int wid_num;
volatile struct sn_flush_device_list *p; struct sn_flush_device_list *p;
int i,j; int i,j;
int bwin; int bwin;
unsigned long flags; unsigned long flags;
......
...@@ -822,7 +822,7 @@ pciio_device_info_unregister(vertex_hdl_t connectpt, ...@@ -822,7 +822,7 @@ pciio_device_info_unregister(vertex_hdl_t connectpt,
pciio_info_t pciio_info) pciio_info_t pciio_info)
{ {
char name[32]; char name[32];
vertex_hdl_t pconn; vertex_hdl_t pconn = NULL;
if (!pciio_info) if (!pciio_info)
return; return;
...@@ -835,7 +835,6 @@ pciio_device_info_unregister(vertex_hdl_t connectpt, ...@@ -835,7 +835,6 @@ pciio_device_info_unregister(vertex_hdl_t connectpt,
hwgraph_vertex_unref(pconn); hwgraph_vertex_unref(pconn);
hwgraph_vertex_destroy(pconn); hwgraph_vertex_destroy(pconn);
} }
/*ARGSUSED */ /*ARGSUSED */
......
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