1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 0573fcfcb2c4..3bec0f733f01 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -93,7 +93,7 @@ static void ibmveth_proc_unregister_driver(void);
 static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter);
 static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter);
 static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance);
-static inline void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter);
+static void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter);
 static struct kobj_type ktype_veth_pool;
 
 #ifdef CONFIG_PROC_FS
@@ -389,7 +389,7 @@ static void ibmveth_rxq_recycle_buffer(struct ibmveth_adapter *adapter)
         }
 }
 
-static inline void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter)
+static void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter)
 {
         ibmveth_remove_buffer_from_pool(adapter, adapter->rx_queue.queue_addr[adapter->rx_queue.index].correlator);
 
@@ -953,14 +953,16 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
         ibmveth_debug_printk_no_adapter("entering ibmveth_probe for UA 0x%x\n",
                                         dev->unit_address);
 
-        mac_addr_p = (unsigned char *) vio_get_attribute(dev, VETH_MAC_ADDR, 0);
+        mac_addr_p = (unsigned char *) vio_get_attribute(dev,
+                                                VETH_MAC_ADDR, NULL);
         if(!mac_addr_p) {
                 printk(KERN_ERR "(%s:%3.3d) ERROR: Can't find VETH_MAC_ADDR "
                                 "attribute\n", __FILE__, __LINE__);
                 return 0;
         }
 
-        mcastFilterSize_p= (unsigned int *) vio_get_attribute(dev, VETH_MCAST_FILTER_SIZE, 0);
+        mcastFilterSize_p = (unsigned int *) vio_get_attribute(dev,
+                                                VETH_MCAST_FILTER_SIZE, NULL);
         if(!mcastFilterSize_p) {
                 printk(KERN_ERR "(%s:%3.3d) ERROR: Can't find "
                                 "VETH_MCAST_FILTER_SIZE attribute\n",