Commit c761b2df authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'rid-w-1-warnings-in-ethernet' 

Lee Jones says:

====================
Rid W=1 warnings in Ethernet

This set is part of a larger effort attempting to clean-up W=1
kernel builds, which are currently overwhelmingly riddled with
niggly little warnings.

v2:
 - Squashed IBM patches
 - Fixed real issue in SMSC
 - Added Andrew's Reviewed-by tags on remainder
====================

Link: https://lore.kernel.org/r/20210115200905.3470941-1-lee.jones@linaro.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9ab7e76a e242d598

drivers/net/ethernet/ibm/ibmvnic.c

+13 −14
Original line number Diff line number Diff line
@@ -1384,10 +1384,10 @@ static int ibmvnic_close(struct net_device *netdev) 


/**

 * build_hdr_data - creates L2/L3/L4 header data buffer

 * @hdr_field - bitfield determining needed headers

 * @skb - socket buffer

 * @hdr_len - array of header lengths

 * @tot_len - total length of data

 * @hdr_field: bitfield determining needed headers

 * @skb: socket buffer

 * @hdr_len: array of header lengths

 * @hdr_data: buffer to write the header to

 *

 * Reads hdr_field to determine which headers are needed by firmware.

 * Builds a buffer containing these headers.  Saves individual header
@@ -1444,11 +1444,11 @@ static int build_hdr_data(u8 hdr_field, struct sk_buff *skb, 


/**

 * create_hdr_descs - create header and header extension descriptors

 * @hdr_field - bitfield determining needed headers

 * @data - buffer containing header data

 * @len - length of data buffer

 * @hdr_len - array of individual header lengths

 * @scrq_arr - descriptor array

 * @hdr_field: bitfield determining needed headers

 * @hdr_data: buffer containing header data

 * @len: length of data buffer

 * @hdr_len: array of individual header lengths

 * @scrq_arr: descriptor array

 *

 * Creates header and, if needed, header extension descriptors and

 * places them in a descriptor array, scrq_arr
@@ -1496,10 +1496,9 @@ static int create_hdr_descs(u8 hdr_field, u8 *hdr_data, int len, int *hdr_len, 


/**

 * build_hdr_descs_arr - build a header descriptor array

 * @skb - socket buffer

 * @num_entries - number of descriptors to be sent

 * @subcrq - first TX descriptor

 * @hdr_field - bit field determining which headers will be sent

 * @txbuff: tx buffer

 * @num_entries: number of descriptors to be sent

 * @hdr_field: bit field determining which headers will be sent

 *

 * This function will build a TX descriptor array with applicable

 * L2/L3/L4 packet header descriptors to be sent by send_subcrq_indirect.
@@ -1925,7 +1924,7 @@ static int ibmvnic_set_mac(struct net_device *netdev, void *p) 
	return rc;

}



/**

/*

 * do_reset returns zero if we are able to keep processing reset events, or

 * non-zero if we hit a fatal error and must halt.

 */

drivers/net/ethernet/smsc/smc91x.c

+1 −1
Original line number Diff line number Diff line
@@ -2191,7 +2191,7 @@ static const struct of_device_id smc91x_match[] = { 
MODULE_DEVICE_TABLE(of, smc91x_match);



/**

 * of_try_set_control_gpio - configure a gpio if it exists

 * try_toggle_control_gpio - configure a gpio if it exists

 * @dev: net device

 * @desc: where to store the GPIO descriptor, if it exists

 * @name: name of the GPIO in DT

drivers/net/ethernet/ti/am65-cpsw-qos.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static void am65_cpsw_est_set_sched_list(struct net_device *ndev, 
		writel(~all_fetch_allow & AM65_CPSW_FETCH_ALLOW_MSK, ram_addr);

}



/**

/*

 * Enable ESTf periodic output, set cycle start time and interval.

 */

static int am65_cpsw_timer_set(struct net_device *ndev,

drivers/net/ethernet/ti/am65-cpts.c

+1 −1
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ static long am65_cpts_ts_work(struct ptp_clock_info *ptp) 
/**

 * am65_cpts_rx_enable - enable rx timestamping

 * @cpts: cpts handle

 * @skb: packet

 * @en: enable

 *

 * This functions enables rx packets timestamping. The CPTS can timestamp all

 * rx packets.

drivers/net/ethernet/toshiba/ps3_gelic_net.c

+5 −3
Original line number Diff line number Diff line
@@ -1100,7 +1100,7 @@ static int gelic_net_poll(struct napi_struct *napi, int budget) 
	return packets_done;

}



/**

/*

 * gelic_card_interrupt - event handler for gelic_net

 */

static irqreturn_t gelic_card_interrupt(int irq, void *ptr)
@@ -1400,6 +1400,7 @@ static void gelic_net_tx_timeout_task(struct work_struct *work) 
/**

 * gelic_net_tx_timeout - called when the tx timeout watchdog kicks in.

 * @netdev: interface device structure

 * @txqueue: unused

 *

 * called, if tx hangs. Schedules a task that resets the interface

 */
@@ -1431,6 +1432,7 @@ static const struct net_device_ops gelic_netdevice_ops = { 
/**

 * gelic_ether_setup_netdev_ops - initialization of net_device operations

 * @netdev: net_device structure

 * @napi: napi structure

 *

 * fills out function pointers in the net_device structure

 */
@@ -1632,7 +1634,7 @@ static void gelic_card_get_vlan_info(struct gelic_card *card) 
	dev_info(ctodev(card), "internal vlan %s\n",

		 card->vlan_required? "enabled" : "disabled");

}

/**

/*

 * ps3_gelic_driver_probe - add a device to the control of this driver

 */

static int ps3_gelic_driver_probe(struct ps3_system_bus_device *dev)
@@ -1787,7 +1789,7 @@ static int ps3_gelic_driver_probe(struct ps3_system_bus_device *dev) 
	return result;

}



/**

/*

 * ps3_gelic_driver_remove - remove a device from the control of this driver

 */