projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2021-02-02-drop-asm_global_data-when-unused'
[platform/kernel/u-boot.git]
/
drivers
/
net
/
ftmac100.c
diff --git
a/drivers/net/ftmac100.c
b/drivers/net/ftmac100.c
index
af3d076
..
c30ace9
100644
(file)
--- a/
drivers/net/ftmac100.c
+++ b/
drivers/net/ftmac100.c
@@
-36,7
+36,7
@@
struct ftmac100_data {
*/
static void ftmac100_reset(struct ftmac100_data *priv)
{
*/
static void ftmac100_reset(struct ftmac100_data *priv)
{
- struct ftmac100 *ftmac100 = (struct ftmac100 *)priv->iobase;
+ struct ftmac100 *ftmac100 = (struct ftmac100 *)
(uintptr_t)
priv->iobase;
debug ("%s()\n", __func__);
debug ("%s()\n", __func__);
@@
-57,7
+57,7
@@
static void ftmac100_reset(struct ftmac100_data *priv)
static void ftmac100_set_mac(struct ftmac100_data *priv ,
const unsigned char *mac)
{
static void ftmac100_set_mac(struct ftmac100_data *priv ,
const unsigned char *mac)
{
- struct ftmac100 *ftmac100 = (struct ftmac100 *)priv->iobase;
+ struct ftmac100 *ftmac100 = (struct ftmac100 *)
(uintptr_t)
priv->iobase;
unsigned int maddr = mac[0] << 8 | mac[1];
unsigned int laddr = mac[2] << 24 | mac[3] << 16 | mac[4] << 8 | mac[5];
unsigned int maddr = mac[0] << 8 | mac[1];
unsigned int laddr = mac[2] << 24 | mac[3] << 16 | mac[4] << 8 | mac[5];
@@
-72,7
+72,7
@@
static void ftmac100_set_mac(struct ftmac100_data *priv ,
*/
static void _ftmac100_halt(struct ftmac100_data *priv)
{
*/
static void _ftmac100_halt(struct ftmac100_data *priv)
{
- struct ftmac100 *ftmac100 = (struct ftmac100 *)priv->iobase;
+ struct ftmac100 *ftmac100 = (struct ftmac100 *)
(uintptr_t)
priv->iobase;
debug ("%s()\n", __func__);
writel (0, &ftmac100->maccr);
}
debug ("%s()\n", __func__);
writel (0, &ftmac100->maccr);
}
@@
-82,7
+82,7
@@
static void _ftmac100_halt(struct ftmac100_data *priv)
*/
static int _ftmac100_init(struct ftmac100_data *priv, unsigned char enetaddr[6])
{
*/
static int _ftmac100_init(struct ftmac100_data *priv, unsigned char enetaddr[6])
{
- struct ftmac100 *ftmac100 = (struct ftmac100 *)priv->iobase;
+ struct ftmac100 *ftmac100 = (struct ftmac100 *)
(uintptr_t)
priv->iobase;
struct ftmac100_txdes *txdes = priv->txdes;
struct ftmac100_rxdes *rxdes = priv->rxdes;
unsigned int maccr;
struct ftmac100_txdes *txdes = priv->txdes;
struct ftmac100_rxdes *rxdes = priv->rxdes;
unsigned int maccr;
@@
-187,7
+187,7
@@
static int __ftmac100_recv(struct ftmac100_data *priv)
*/
static int _ftmac100_send(struct ftmac100_data *priv, void *packet, int length)
{
*/
static int _ftmac100_send(struct ftmac100_data *priv, void *packet, int length)
{
- struct ftmac100 *ftmac100 = (struct ftmac100 *)priv->iobase;
+ struct ftmac100 *ftmac100 = (struct ftmac100 *)
(uintptr_t)
priv->iobase;
struct ftmac100_txdes *curr_des = priv->txdes;
ulong start;
struct ftmac100_txdes *curr_des = priv->txdes;
ulong start;