diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-17 16:08:54 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-17 16:08:54 -0400 |
| commit | 1c4b5038afcc7cdb1064713f65571da05aa0de0e (patch) | |
| tree | bbb554b1128dc15453a91fc50408446da2e0ddd2 /drivers/usb/eth | |
| parent | 7c3cc6f106ed1ca13b0ff6eea9f8e1473240aef3 (diff) | |
| parent | 21fc5a16855602b2fd4b39e40679f854101a0fa3 (diff) | |
Merge branch '2020-07-17-misc-fixes'
A large number of assorted fixes, including but not limited to:
- Correct fixdep and CONFIG_IS_ENABLED(...)
- lz4 on big endian
- Assorted LMB hardening
- Remove bd_t typedef
Diffstat (limited to 'drivers/usb/eth')
| -rw-r--r-- | drivers/usb/eth/asix.c | 2 | ||||
| -rw-r--r-- | drivers/usb/eth/asix88179.c | 2 | ||||
| -rw-r--r-- | drivers/usb/eth/mcs7830.c | 2 | ||||
| -rw-r--r-- | drivers/usb/eth/r8152.c | 2 | ||||
| -rw-r--r-- | drivers/usb/eth/smsc95xx.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c index db75ae2498c..ac4a27fff20 100644 --- a/drivers/usb/eth/asix.c +++ b/drivers/usb/eth/asix.c @@ -498,7 +498,7 @@ static int asix_send_common(struct ueth_data *dev, void *packet, int length) /* * Asix callbacks */ -static int asix_init(struct eth_device *eth, bd_t *bd) +static int asix_init(struct eth_device *eth, struct bd_info *bd) { struct ueth_data *dev = (struct ueth_data *)eth->priv; diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c index 381bef2bed8..c142b8b19bf 100644 --- a/drivers/usb/eth/asix88179.c +++ b/drivers/usb/eth/asix88179.c @@ -509,7 +509,7 @@ static int asix_send_common(struct ueth_data *dev, /* * Asix callbacks */ -static int asix_init(struct eth_device *eth, bd_t *bd) +static int asix_init(struct eth_device *eth, struct bd_info *bd) { struct ueth_data *dev = (struct ueth_data *)eth->priv; struct asix_private *dev_priv = (struct asix_private *)dev->dev_priv; diff --git a/drivers/usb/eth/mcs7830.c b/drivers/usb/eth/mcs7830.c index 0cb7dbc8fb8..c829a436a34 100644 --- a/drivers/usb/eth/mcs7830.c +++ b/drivers/usb/eth/mcs7830.c @@ -586,7 +586,7 @@ static int mcs7830_recv_common(struct ueth_data *ueth, uint8_t *buf) * ensures that the link is up and subsequent send() and recv() calls can * exchange ethernet frames */ -static int mcs7830_init(struct eth_device *eth, bd_t *bd) +static int mcs7830_init(struct eth_device *eth, struct bd_info *bd) { struct ueth_data *dev = eth->priv; diff --git a/drivers/usb/eth/r8152.c b/drivers/usb/eth/r8152.c index f201a1789b6..1845d957f97 100644 --- a/drivers/usb/eth/r8152.c +++ b/drivers/usb/eth/r8152.c @@ -1249,7 +1249,7 @@ static int r8152_send_common(struct ueth_data *ueth, void *packet, int length) } #ifndef CONFIG_DM_ETH -static int r8152_init(struct eth_device *eth, bd_t *bd) +static int r8152_init(struct eth_device *eth, struct bd_info *bd) { struct ueth_data *dev = (struct ueth_data *)eth->priv; struct r8152 *tp = (struct r8152 *)dev->dev_priv; diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index d3532df141f..b293a808a3d 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -716,7 +716,7 @@ static int smsc95xx_send_common(struct ueth_data *dev, void *packet, int length) /* * Smsc95xx callbacks */ -static int smsc95xx_init(struct eth_device *eth, bd_t *bd) +static int smsc95xx_init(struct eth_device *eth, struct bd_info *bd) { struct ueth_data *dev = (struct ueth_data *)eth->priv; struct usb_device *udev = dev->pusb_dev; |
