From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bryan Wu Subject: [PATCH 1/3] Blackfin EMAC Driver: add proper __devinit/__devexit markings Date: Sun, 27 Jul 2008 14:13:53 +0800 Message-ID: <1217139235-19018-2-git-send-email-cooloney@kernel.org> References: <1217139235-19018-1-git-send-email-cooloney@kernel.org> Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, Mike Frysinger , Bryan Wu To: jeff@garzik.org Return-path: Received: from po-out-1718.google.com ([72.14.252.154]:26265 "EHLO po-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757279AbYG0GOd (ORCPT ); Sun, 27 Jul 2008 02:14:33 -0400 Received: by po-out-1718.google.com with SMTP id c31so8067607poi.1 for ; Sat, 26 Jul 2008 23:14:33 -0700 (PDT) In-Reply-To: <1217139235-19018-1-git-send-email-cooloney@kernel.org> Sender: netdev-owner@vger.kernel.org List-ID: From: Mike Frysinger Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu --- drivers/net/bfin_mac.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c index 4144343..e18a7ee 100644 --- a/drivers/net/bfin_mac.c +++ b/drivers/net/bfin_mac.c @@ -614,7 +614,7 @@ static int bfin_mac_hard_start_xmit(struct sk_buff *skb, * Is skb->data always 16-bit aligned? * Do we need to memcpy((char *)(tail->packet + 2), skb->data, len)? */ - if ((((unsigned int)(skb->data)) & 0x02) == 2) { + if ((((unsigned int)(skb->data)) & 0x01) == 0) { /* move skb->data to current_tx_ptr payload */ data = (unsigned int)(skb->data) - 2; *((unsigned short *)data) = (unsigned short)(skb->len); @@ -956,7 +956,7 @@ static int bfin_mac_close(struct net_device *dev) return 0; } -static int __init bfin_mac_probe(struct platform_device *pdev) +static int __devinit bfin_mac_probe(struct platform_device *pdev) { struct net_device *ndev; struct bfin_mac_local *lp; @@ -1082,7 +1082,7 @@ out_err_probe_mac: return rc; } -static int bfin_mac_remove(struct platform_device *pdev) +static int __devexit bfin_mac_remove(struct platform_device *pdev) { struct net_device *ndev = platform_get_drvdata(pdev); struct bfin_mac_local *lp = netdev_priv(ndev); @@ -1129,7 +1129,7 @@ static int bfin_mac_resume(struct platform_device *pdev) static struct platform_driver bfin_mac_driver = { .probe = bfin_mac_probe, - .remove = bfin_mac_remove, + .remove = __devexit_p(bfin_mac_remove), .resume = bfin_mac_resume, .suspend = bfin_mac_suspend, .driver = { -- 1.5.6