mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-03-21 19:42:31 -04:00
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: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
@@ -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.
|
||||
*/
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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
|
||||
*/
|
||||
|
||||
|
||||
@@ -254,7 +254,7 @@ spider_net_set_promisc(struct spider_net_card *card)
|
||||
|
||||
/**
|
||||
* spider_net_get_descr_status -- returns the status of a descriptor
|
||||
* @descr: descriptor to look at
|
||||
* @hwdescr: descriptor to look at
|
||||
*
|
||||
* returns the status as in the dmac_cmd_status field of the descriptor
|
||||
*/
|
||||
@@ -542,6 +542,7 @@ spider_net_alloc_rx_skbs(struct spider_net_card *card)
|
||||
|
||||
/**
|
||||
* spider_net_get_multicast_hash - generates hash for multicast filter table
|
||||
* @netdev: interface device structure
|
||||
* @addr: multicast address
|
||||
*
|
||||
* returns the hash value.
|
||||
@@ -890,7 +891,7 @@ spider_net_xmit(struct sk_buff *skb, struct net_device *netdev)
|
||||
|
||||
/**
|
||||
* spider_net_cleanup_tx_ring - cleans up the TX ring
|
||||
* @card: card structure
|
||||
* @t: timer context used to obtain the pointer to net card data structure
|
||||
*
|
||||
* spider_net_cleanup_tx_ring is called by either the tx_timer
|
||||
* or from the NAPI polling routine.
|
||||
@@ -1063,6 +1064,7 @@ static void show_rx_chain(struct spider_net_card *card)
|
||||
|
||||
/**
|
||||
* spider_net_resync_head_ptr - Advance head ptr past empty descrs
|
||||
* @card: card structure
|
||||
*
|
||||
* If the driver fails to keep up and empty the queue, then the
|
||||
* hardware wil run out of room to put incoming packets. This
|
||||
@@ -1220,7 +1222,7 @@ spider_net_decode_one_descr(struct spider_net_card *card)
|
||||
|
||||
/**
|
||||
* spider_net_poll - NAPI poll function called by the stack to return packets
|
||||
* @netdev: interface device structure
|
||||
* @napi: napi device structure
|
||||
* @budget: number of packets we can pass to the stack at most
|
||||
*
|
||||
* returns 0 if no more packets available to the driver/stack. Returns 1,
|
||||
@@ -1268,7 +1270,7 @@ static int spider_net_poll(struct napi_struct *napi, int budget)
|
||||
/**
|
||||
* spider_net_set_mac - sets the MAC of an interface
|
||||
* @netdev: interface device structure
|
||||
* @ptr: pointer to new MAC address
|
||||
* @p: pointer to new MAC address
|
||||
*
|
||||
* Returns 0 on success, <0 on failure. Currently, we don't support this
|
||||
* and will always return EOPNOTSUPP.
|
||||
@@ -1340,6 +1342,8 @@ spider_net_link_reset(struct net_device *netdev)
|
||||
* spider_net_handle_error_irq - handles errors raised by an interrupt
|
||||
* @card: card structure
|
||||
* @status_reg: interrupt status register 0 (GHIINT0STS)
|
||||
* @error_reg1: interrupt status register 1 (GHIINT1STS)
|
||||
* @error_reg2: interrupt status register 2 (GHIINT2STS)
|
||||
*
|
||||
* spider_net_handle_error_irq treats or ignores all error conditions
|
||||
* found when an interrupt is presented
|
||||
@@ -1961,8 +1965,7 @@ spider_net_open(struct net_device *netdev)
|
||||
|
||||
/**
|
||||
* spider_net_link_phy
|
||||
* @data: used for pointer to card structure
|
||||
*
|
||||
* @t: timer context used to obtain the pointer to net card data structure
|
||||
*/
|
||||
static void spider_net_link_phy(struct timer_list *t)
|
||||
{
|
||||
@@ -2140,7 +2143,7 @@ spider_net_stop(struct net_device *netdev)
|
||||
/**
|
||||
* spider_net_tx_timeout_task - task scheduled by the watchdog timeout
|
||||
* function (to be called not under interrupt status)
|
||||
* @data: data, is interface device structure
|
||||
* @work: work context used to obtain the pointer to net card data structure
|
||||
*
|
||||
* called as task when tx hangs, resets interface (if interface is up)
|
||||
*/
|
||||
@@ -2174,6 +2177,7 @@ spider_net_tx_timeout_task(struct work_struct *work)
|
||||
/**
|
||||
* spider_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
|
||||
*/
|
||||
|
||||
@@ -411,7 +411,7 @@ static void read_xenbus_frontend_xdp(struct backend_info *be,
|
||||
vif->xdp_headroom = headroom;
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* Callback received when the frontend's state changes.
|
||||
*/
|
||||
static void frontend_changed(struct xenbus_device *dev,
|
||||
@@ -996,7 +996,7 @@ static int netback_remove(struct xenbus_device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* Entry point to this code when a new device is created. Allocate the basic
|
||||
* structures and switch to InitWait.
|
||||
*/
|
||||
|
||||
@@ -1580,7 +1580,7 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)
|
||||
return ERR_PTR(err);
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* Entry point to this code when a new device is created. Allocate the basic
|
||||
* structures and the ring buffers for communication with the backend, and
|
||||
* inform the backend of the appropriate details for those.
|
||||
@@ -1657,7 +1657,7 @@ static void xennet_disconnect_backend(struct netfront_info *info)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* We are reconnecting to the backend, due to a suspend/resume, or a backend
|
||||
* driver restart. We tear down our netif structure and recreate it, but
|
||||
* leave the device-layer structures intact so that this is transparent to the
|
||||
@@ -2303,7 +2303,7 @@ static int xennet_connect(struct net_device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* Callback received when the backend's state changes.
|
||||
*/
|
||||
static void netback_changed(struct xenbus_device *dev,
|
||||
|
||||
Reference in New Issue
Block a user