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

Commit 14d4171d authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

net/ps3_gelic_net: remove __dev* attributes 



CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Geoff Levand <geoff@infradead.org>
Cc: cbe-oss-dev@lists.ozlabs.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e38921d4

drivers/net/ethernet/toshiba/ps3_gelic_net.c

+7 −7
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static void gelic_card_free_chain(struct gelic_card *card, 
 *

 * returns 0 on success, <0 on failure

 */

static int __devinit gelic_card_init_chain(struct gelic_card *card,

static int gelic_card_init_chain(struct gelic_card *card,

					   struct gelic_descr_chain *chain,

					   struct gelic_descr *start_descr,

					   int no)
@@ -428,7 +428,7 @@ static int gelic_card_fill_rx_chain(struct gelic_card *card) 
 *

 * returns 0 on success, < 0 on failure

 */

static int __devinit gelic_card_alloc_rx_skbs(struct gelic_card *card)

static int gelic_card_alloc_rx_skbs(struct gelic_card *card)

{

	struct gelic_descr_chain *chain;

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

 * fills out function pointers in the net_device structure

 */

static void __devinit gelic_ether_setup_netdev_ops(struct net_device *netdev,

static void gelic_ether_setup_netdev_ops(struct net_device *netdev,

						   struct napi_struct *napi)

{

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

 * and register it.

 **/

int __devinit gelic_net_setup_netdev(struct net_device *netdev,

int gelic_net_setup_netdev(struct net_device *netdev,

				     struct gelic_card *card)

{

	int status;
@@ -1542,7 +1542,7 @@ int __devinit gelic_net_setup_netdev(struct net_device *netdev, 
 * the card and net_device structures are linked to each other

 */

#define GELIC_ALIGN (32)

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

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

{

	struct gelic_card *card;

	struct gelic_port *port;
@@ -1593,7 +1593,7 @@ static struct gelic_card * __devinit gelic_alloc_card_net(struct net_device **ne 
	return card;

}



static void __devinit gelic_card_get_vlan_info(struct gelic_card *card)

static void gelic_card_get_vlan_info(struct gelic_card *card)

{

	u64 v1, v2;

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

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

 */

static int __devinit ps3_gelic_driver_probe(struct ps3_system_bus_device *dev)

static int ps3_gelic_driver_probe(struct ps3_system_bus_device *dev)

{

	struct gelic_card *card;

	struct net_device *netdev;