* [PATCH] xilinx: Fix compiler warning
@ 2014-06-22 10:21 Manuel Schölling
2014-06-22 11:15 ` Sergei Shtylyov
0 siblings, 1 reply; 5+ messages in thread
From: Manuel Schölling @ 2014-06-22 10:21 UTC (permalink / raw)
To: michal.simek
Cc: anirudh, John.Linn, davem, netdev, linux-arm-kernel, linux-kernel,
Manuel Schölling
The time comparsion functions require arguments of type unsigned long
instead of (signed) long.
Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
---
drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +-
drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 2 +-
drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +-
init/do_mounts.c | 1 -
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 4ef818a..8a6e5c2 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -72,7 +72,7 @@ void temac_iow(struct temac_local *lp, int offset, u32 value)
int temac_indirect_busywait(struct temac_local *lp)
{
- long end = jiffies + 2;
+ unsigned long end = jiffies + 2;
while (!(temac_ior(lp, XTE_RDY0_OFFSET) & XTE_RDY0_HARD_ACS_RDY_MASK)) {
if (time_before_eq(end, jiffies)) {
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
index d4abf47..3b67d60 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
@@ -19,7 +19,7 @@
/* Wait till MDIO interface is ready to accept a new transaction.*/
int axienet_mdio_wait_until_ready(struct axienet_local *lp)
{
- long end = jiffies + 2;
+ unsigned long end = jiffies + 2;
while (!(axienet_ior(lp, XAE_MDIO_MCR_OFFSET) &
XAE_MDIO_MCR_READY_MASK)) {
if (time_before_eq(end, jiffies)) {
diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index 8c4aed3..782bb93 100644
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -695,7 +695,7 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id)
static int xemaclite_mdio_wait(struct net_local *lp)
{
- long end = jiffies + 2;
+ unsigned long end = jiffies + 2;
/* wait for the MDIO interface to not be busy or timeout
after some time.
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 60c4196..2d069a3 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -351,7 +351,6 @@ static void __init get_fs_names(char *page)
continue;
line++;
- /* append fsname */
memmove(fsnames, line, strlen(line)+1);
fsnames += strlen(fsnames)+1;
} while (page != NULL);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] xilinx: Fix compiler warning
2014-06-22 10:21 [PATCH] xilinx: Fix compiler warning Manuel Schölling
@ 2014-06-22 11:15 ` Sergei Shtylyov
2014-06-22 11:23 ` Manuel Schoelling
2014-06-22 11:24 ` [PATCH v2] " Manuel Schölling
0 siblings, 2 replies; 5+ messages in thread
From: Sergei Shtylyov @ 2014-06-22 11:15 UTC (permalink / raw)
To: Manuel Schölling, michal.simek
Cc: anirudh, John.Linn, davem, netdev, linux-arm-kernel, linux-kernel
Hello.
On 06/22/2014 02:21 PM, Manuel Schölling wrote:
> The time comparsion functions require arguments of type unsigned long
> instead of (signed) long.
> Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
[...]
> diff --git a/init/do_mounts.c b/init/do_mounts.c
> index 60c4196..2d069a3 100644
> --- a/init/do_mounts.c
> +++ b/init/do_mounts.c
> @@ -351,7 +351,6 @@ static void __init get_fs_names(char *page)
> continue;
> line++;
>
> - /* append fsname */
> memmove(fsnames, line, strlen(line)+1);
> fsnames += strlen(fsnames)+1;
> } while (page != NULL);
>
Seems like unrelated random change.
WBR, Sergei
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] xilinx: Fix compiler warning
2014-06-22 11:15 ` Sergei Shtylyov
@ 2014-06-22 11:23 ` Manuel Schoelling
2014-06-22 11:24 ` [PATCH v2] " Manuel Schölling
1 sibling, 0 replies; 5+ messages in thread
From: Manuel Schoelling @ 2014-06-22 11:23 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: michal.simek, anirudh, John.Linn, davem, netdev, linux-arm-kernel,
linux-kernel
On So, 2014-06-22 at 15:15 +0400, Sergei Shtylyov wrote:
> Hello.
>
> On 06/22/2014 02:21 PM, Manuel Schölling wrote:
>
> > The time comparsion functions require arguments of type unsigned long
> > instead of (signed) long.
>
> > Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
>
> [...]
>
> > diff --git a/init/do_mounts.c b/init/do_mounts.c
> > index 60c4196..2d069a3 100644
> > --- a/init/do_mounts.c
> > +++ b/init/do_mounts.c
> > @@ -351,7 +351,6 @@ static void __init get_fs_names(char *page)
> > continue;
> > line++;
> >
> > - /* append fsname */
> > memmove(fsnames, line, strlen(line)+1);
> > fsnames += strlen(fsnames)+1;
> > } while (page != NULL);
> >
>
> Seems like unrelated random change.
Thanks, you are right: somehow this change made it into my patch.
Probably I was not careful enough when using 'git commit -a'.
Sorry, I will resend a fixed patch in a second.
>
> WBR, Sergei
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] xilinx: Fix compiler warning
2014-06-22 11:15 ` Sergei Shtylyov
2014-06-22 11:23 ` Manuel Schoelling
@ 2014-06-22 11:24 ` Manuel Schölling
2014-06-23 0:15 ` David Miller
1 sibling, 1 reply; 5+ messages in thread
From: Manuel Schölling @ 2014-06-22 11:24 UTC (permalink / raw)
To: sergei.shtylyov
Cc: michal.simek, anirudh, John.Linn, davem, netdev, linux-arm-kernel,
linux-kernel, Manuel Schölling
The time comparsion functions require arguments of type unsigned long
instead of (signed) long.
Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
---
drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +-
drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 2 +-
drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 4ef818a..8a6e5c2 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -72,7 +72,7 @@ void temac_iow(struct temac_local *lp, int offset, u32 value)
int temac_indirect_busywait(struct temac_local *lp)
{
- long end = jiffies + 2;
+ unsigned long end = jiffies + 2;
while (!(temac_ior(lp, XTE_RDY0_OFFSET) & XTE_RDY0_HARD_ACS_RDY_MASK)) {
if (time_before_eq(end, jiffies)) {
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
index d4abf47..3b67d60 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c
@@ -19,7 +19,7 @@
/* Wait till MDIO interface is ready to accept a new transaction.*/
int axienet_mdio_wait_until_ready(struct axienet_local *lp)
{
- long end = jiffies + 2;
+ unsigned long end = jiffies + 2;
while (!(axienet_ior(lp, XAE_MDIO_MCR_OFFSET) &
XAE_MDIO_MCR_READY_MASK)) {
if (time_before_eq(end, jiffies)) {
diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index 8c4aed3..782bb93 100644
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -695,7 +695,7 @@ static irqreturn_t xemaclite_interrupt(int irq, void *dev_id)
static int xemaclite_mdio_wait(struct net_local *lp)
{
- long end = jiffies + 2;
+ unsigned long end = jiffies + 2;
/* wait for the MDIO interface to not be busy or timeout
after some time.
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-06-23 0:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-22 10:21 [PATCH] xilinx: Fix compiler warning Manuel Schölling
2014-06-22 11:15 ` Sergei Shtylyov
2014-06-22 11:23 ` Manuel Schoelling
2014-06-22 11:24 ` [PATCH v2] " Manuel Schölling
2014-06-23 0:15 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).