X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fnet%2Fns83820.c;h=a3c3fc9c0d8a8ec241b452dde7f4aba968b3bb1d;hb=333c47c847c90aaefde8b593054d9344106333b5;hp=83334db2921c98349bf737aeeee00c630b931d0f;hpb=c4052da6f0c01a0b059d125d72bb934d0980b798;p=linux-2.6

diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 83334db292..a3c3fc9c0d 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -584,7 +584,7 @@ static inline int ns83820_add_rx_skb(struct ns83820 *dev, struct sk_buff *skb)
 	return 0;
 }
 
-static inline int rx_refill(struct net_device *ndev, unsigned int __nocast gfp)
+static inline int rx_refill(struct net_device *ndev, gfp_t gfp)
 {
 	struct ns83820 *dev = PRIV(ndev);
 	unsigned i;
@@ -1632,8 +1632,7 @@ static void ns83820_run_bist(struct net_device *ndev, const char *name, u32 enab
 			timed_out = 1;
 			break;
 		}
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		schedule_timeout(1);
+		schedule_timeout_uninterruptible(1);
 	}
 
 	if (status & fail)