Commit 493a684a authored by Michael Ellerman's avatar Michael Ellerman Committed by Jeff Garzik
Browse files

Fix sparse errors in drivers/net/ibmveth.c 



drivers/net/ibmveth.c:96:46: error: marked inline, but without a definition
drivers/net/ibmveth.c:96: warning: 'ibmveth_rxq_harvest_buffer' declared inline after being called
drivers/net/ibmveth.c:96: warning: previous declaration of 'ibmveth_rxq_harvest_buffer' was here

Just let the compiler decide, as it happens gcc 4.~ inlines it anyway.

drivers/net/ibmveth.c:957:71: warning: Using plain integer as NULL pointer
drivers/net/ibmveth.c:964:85: warning: Using plain integer as NULL pointer

Split the long lines as well, ugly, but < 80 columns.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent c2bcf00b

drivers/net/ibmveth.c

+6 −4
Original line number Diff line number Diff line
@@ -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",

CRA Git | Maintained and supported by SUSTech CRA and CCSE