Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48dce82c authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Benjamin Herrenschmidt
Browse files

net/ps3: gelic - Add missing annotations 



probe functions should be __devinit

Signed-off-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Acked-by: default avatarGeoff Levand <geoffrey.levand@am.sony.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 9317726d

drivers/net/ps3_gelic_net.c

+12 −10
Original line number Diff line number Diff line
@@ -214,9 +214,10 @@ static void gelic_card_free_chain(struct gelic_card *card, 
 *

 * returns 0 on success, <0 on failure

 */

static int gelic_card_init_chain(struct gelic_card *card,

static int __devinit gelic_card_init_chain(struct gelic_card *card,

					   struct gelic_descr_chain *chain,

				 struct gelic_descr *start_descr, int no)

					   struct gelic_descr *start_descr,

					   int no)

{

	int i;

	struct gelic_descr *descr;
@@ -407,7 +408,7 @@ static int gelic_card_fill_rx_chain(struct gelic_card *card) 
 *

 * returns 0 on success, < 0 on failure

 */

static int gelic_card_alloc_rx_skbs(struct gelic_card *card)

static int __devinit gelic_card_alloc_rx_skbs(struct gelic_card *card)

{

	struct gelic_descr_chain *chain;

	int ret;
@@ -1422,7 +1423,7 @@ static const struct net_device_ops gelic_netdevice_ops = { 
 *

 * fills out function pointers in the net_device structure

 */

static void gelic_ether_setup_netdev_ops(struct net_device *netdev,

static void __devinit gelic_ether_setup_netdev_ops(struct net_device *netdev,

						   struct napi_struct *napi)

{

	netdev->watchdog_timeo = GELIC_NET_WATCHDOG_TIMEOUT;
@@ -1443,7 +1444,8 @@ static void gelic_ether_setup_netdev_ops(struct net_device *netdev, 
 * gelic_ether_setup_netdev initializes the net_device structure

 * and register it.

 **/

int gelic_net_setup_netdev(struct net_device *netdev, struct gelic_card *card)

int __devinit gelic_net_setup_netdev(struct net_device *netdev,

				     struct gelic_card *card)

{

	int status;

	u64 v1, v2;
@@ -1491,7 +1493,7 @@ int gelic_net_setup_netdev(struct net_device *netdev, struct gelic_card *card) 
 * the card and net_device structures are linked to each other

 */

#define GELIC_ALIGN (32)

static struct gelic_card *gelic_alloc_card_net(struct net_device **netdev)

static struct gelic_card * __devinit gelic_alloc_card_net(struct net_device **netdev)

{

	struct gelic_card *card;

	struct gelic_port *port;
@@ -1542,7 +1544,7 @@ static struct gelic_card *gelic_alloc_card_net(struct net_device **netdev) 
	return card;

}



static void gelic_card_get_vlan_info(struct gelic_card *card)

static void __devinit gelic_card_get_vlan_info(struct gelic_card *card)

{

	u64 v1, v2;

	int status;
@@ -1616,7 +1618,7 @@ static void gelic_card_get_vlan_info(struct gelic_card *card) 
/**

 * ps3_gelic_driver_probe - add a device to the control of this driver

 */

static int ps3_gelic_driver_probe(struct ps3_system_bus_device *dev)

static int __devinit ps3_gelic_driver_probe(struct ps3_system_bus_device *dev)

{

	struct gelic_card *card;

	struct net_device *netdev;

drivers/net/ps3_gelic_wireless.c

+3 −3
Original line number Diff line number Diff line
@@ -2442,7 +2442,7 @@ static const struct iw_handler_def gelic_wl_wext_handler_def = { 
#endif

};



static struct net_device *gelic_wl_alloc(struct gelic_card *card)

static struct net_device * __devinit gelic_wl_alloc(struct gelic_card *card)

{

	struct net_device *netdev;

	struct gelic_port *port;
@@ -2722,7 +2722,7 @@ static struct ethtool_ops gelic_wl_ethtool_ops = { 
	.set_rx_csum	= gelic_net_set_rx_csum,

};



static void gelic_wl_setup_netdev_ops(struct net_device *netdev)

static void __devinit gelic_wl_setup_netdev_ops(struct net_device *netdev)

{

	struct gelic_wl_info *wl;

	wl = port_wl(netdev_priv(netdev));
@@ -2738,7 +2738,7 @@ static void gelic_wl_setup_netdev_ops(struct net_device *netdev) 
/*

 * driver probe/remove

 */

int gelic_wl_driver_probe(struct gelic_card *card)

int __devinit gelic_wl_driver_probe(struct gelic_card *card)

{

	int ret;

	struct net_device *netdev;