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

Commit fd97ba5d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '20130925_dn_externs_3' of git://repo.or.cz/linux-2.6/trivial-mods 



More extern removals from Joe Perches.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c359ca88 a958df5d

drivers/net/vmxnet3/vmxnet3_int.h

+2 −2
Original line number Diff line number Diff line
@@ -410,9 +410,9 @@ int 
vmxnet3_create_queues(struct vmxnet3_adapter *adapter,

		      u32 tx_ring_size, u32 rx_ring_size, u32 rx_ring2_size);



extern void vmxnet3_set_ethtool_ops(struct net_device *netdev);

void vmxnet3_set_ethtool_ops(struct net_device *netdev);



extern struct rtnl_link_stats64 *

struct rtnl_link_stats64 *

vmxnet3_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats);



extern char vmxnet3_driver_name[];

drivers/net/wan/x25_asy.h

+1 −1
Original line number Diff line number Diff line
@@ -41,6 +41,6 @@ struct x25_asy { 


#define X25_ASY_MAGIC 0x5303



extern int x25_asy_init(struct net_device *dev);

int x25_asy_init(struct net_device *dev);



#endif	/* _LINUX_X25_ASY.H */

drivers/net/wan/z85230.h

+13 −14
Original line number Diff line number Diff line
@@ -395,20 +395,19 @@ struct z8530_dev 
extern u8 z8530_dead_port[];

extern u8 z8530_hdlc_kilostream_85230[];

extern u8 z8530_hdlc_kilostream[];

extern irqreturn_t z8530_interrupt(int, void *);

extern void z8530_describe(struct z8530_dev *, char *mapping, unsigned long io);

extern int z8530_init(struct z8530_dev *);

extern int z8530_shutdown(struct z8530_dev *);

extern int z8530_sync_open(struct net_device *, struct z8530_channel *);

extern int z8530_sync_close(struct net_device *, struct z8530_channel *);

extern int z8530_sync_dma_open(struct net_device *, struct z8530_channel *);

extern int z8530_sync_dma_close(struct net_device *, struct z8530_channel *);

extern int z8530_sync_txdma_open(struct net_device *, struct z8530_channel *);

extern int z8530_sync_txdma_close(struct net_device *, struct z8530_channel *);

extern int z8530_channel_load(struct z8530_channel *, u8 *);

extern netdev_tx_t z8530_queue_xmit(struct z8530_channel *c,

					  struct sk_buff *skb);

extern void z8530_null_rx(struct z8530_channel *c, struct sk_buff *skb);

irqreturn_t z8530_interrupt(int, void *);

void z8530_describe(struct z8530_dev *, char *mapping, unsigned long io);

int z8530_init(struct z8530_dev *);

int z8530_shutdown(struct z8530_dev *);

int z8530_sync_open(struct net_device *, struct z8530_channel *);

int z8530_sync_close(struct net_device *, struct z8530_channel *);

int z8530_sync_dma_open(struct net_device *, struct z8530_channel *);

int z8530_sync_dma_close(struct net_device *, struct z8530_channel *);

int z8530_sync_txdma_open(struct net_device *, struct z8530_channel *);

int z8530_sync_txdma_close(struct net_device *, struct z8530_channel *);

int z8530_channel_load(struct z8530_channel *, u8 *);

netdev_tx_t z8530_queue_xmit(struct z8530_channel *c, struct sk_buff *skb);

void z8530_null_rx(struct z8530_channel *c, struct sk_buff *skb);





/*

drivers/net/wimax/i2400m/i2400m-usb.h

+13 −14
Original line number Diff line number Diff line
@@ -256,21 +256,20 @@ void i2400mu_init(struct i2400mu *i2400mu) 
	i2400mu->rx_size_auto_shrink = 1;

}



extern int i2400mu_notification_setup(struct i2400mu *);

extern void i2400mu_notification_release(struct i2400mu *);

int i2400mu_notification_setup(struct i2400mu *);

void i2400mu_notification_release(struct i2400mu *);



extern int i2400mu_rx_setup(struct i2400mu *);

extern void i2400mu_rx_release(struct i2400mu *);

extern void i2400mu_rx_kick(struct i2400mu *);

int i2400mu_rx_setup(struct i2400mu *);

void i2400mu_rx_release(struct i2400mu *);

void i2400mu_rx_kick(struct i2400mu *);



extern int i2400mu_tx_setup(struct i2400mu *);

extern void i2400mu_tx_release(struct i2400mu *);

extern void i2400mu_bus_tx_kick(struct i2400m *);

int i2400mu_tx_setup(struct i2400mu *);

void i2400mu_tx_release(struct i2400mu *);

void i2400mu_bus_tx_kick(struct i2400m *);



extern ssize_t i2400mu_bus_bm_cmd_send(struct i2400m *,

				       const struct i2400m_bootrom_header *,

				       size_t, int);

extern ssize_t i2400mu_bus_bm_wait_for_ack(struct i2400m *,

					   struct i2400m_bootrom_header *,

					   size_t);

ssize_t i2400mu_bus_bm_cmd_send(struct i2400m *,

				const struct i2400m_bootrom_header *, size_t,

				int);

ssize_t i2400mu_bus_bm_wait_for_ack(struct i2400m *,

				    struct i2400m_bootrom_header *, size_t);

#endif /* #ifndef __I2400M_USB_H__ */

drivers/net/wimax/i2400m/i2400m.h

+57 −60
Original line number Diff line number Diff line
@@ -710,18 +710,18 @@ enum i2400m_bri { 
	I2400M_BRI_MAC_REINIT = 1 << 3,

};



extern void i2400m_bm_cmd_prepare(struct i2400m_bootrom_header *);

extern int i2400m_dev_bootstrap(struct i2400m *, enum i2400m_bri);

extern int i2400m_read_mac_addr(struct i2400m *);

extern int i2400m_bootrom_init(struct i2400m *, enum i2400m_bri);

extern int i2400m_is_boot_barker(struct i2400m *, const void *, size_t);

void i2400m_bm_cmd_prepare(struct i2400m_bootrom_header *);

int i2400m_dev_bootstrap(struct i2400m *, enum i2400m_bri);

int i2400m_read_mac_addr(struct i2400m *);

int i2400m_bootrom_init(struct i2400m *, enum i2400m_bri);

int i2400m_is_boot_barker(struct i2400m *, const void *, size_t);

static inline

int i2400m_is_d2h_barker(const void *buf)

{

	const __le32 *barker = buf;

	return le32_to_cpu(*barker) == I2400M_D2H_MSG_BARKER;

}

extern void i2400m_unknown_barker(struct i2400m *, const void *, size_t);

void i2400m_unknown_barker(struct i2400m *, const void *, size_t);



/* Make/grok boot-rom header commands */
@@ -789,32 +789,31 @@ unsigned i2400m_brh_get_signature(const struct i2400m_bootrom_header *hdr) 
/*

 * Driver / device setup and internal functions

 */

extern void i2400m_init(struct i2400m *);

extern int i2400m_reset(struct i2400m *, enum i2400m_reset_type);

extern void i2400m_netdev_setup(struct net_device *net_dev);

extern int i2400m_sysfs_setup(struct device_driver *);

extern void i2400m_sysfs_release(struct device_driver *);

extern int i2400m_tx_setup(struct i2400m *);

extern void i2400m_wake_tx_work(struct work_struct *);

extern void i2400m_tx_release(struct i2400m *);



extern int i2400m_rx_setup(struct i2400m *);

extern void i2400m_rx_release(struct i2400m *);



extern void i2400m_fw_cache(struct i2400m *);

extern void i2400m_fw_uncache(struct i2400m *);



extern void i2400m_net_rx(struct i2400m *, struct sk_buff *, unsigned,

			  const void *, int);

extern void i2400m_net_erx(struct i2400m *, struct sk_buff *,

			   enum i2400m_cs);

extern void i2400m_net_wake_stop(struct i2400m *);

void i2400m_init(struct i2400m *);

int i2400m_reset(struct i2400m *, enum i2400m_reset_type);

void i2400m_netdev_setup(struct net_device *net_dev);

int i2400m_sysfs_setup(struct device_driver *);

void i2400m_sysfs_release(struct device_driver *);

int i2400m_tx_setup(struct i2400m *);

void i2400m_wake_tx_work(struct work_struct *);

void i2400m_tx_release(struct i2400m *);



int i2400m_rx_setup(struct i2400m *);

void i2400m_rx_release(struct i2400m *);



void i2400m_fw_cache(struct i2400m *);

void i2400m_fw_uncache(struct i2400m *);



void i2400m_net_rx(struct i2400m *, struct sk_buff *, unsigned, const void *,

		   int);

void i2400m_net_erx(struct i2400m *, struct sk_buff *, enum i2400m_cs);

void i2400m_net_wake_stop(struct i2400m *);

enum i2400m_pt;

extern int i2400m_tx(struct i2400m *, const void *, size_t, enum i2400m_pt);

int i2400m_tx(struct i2400m *, const void *, size_t, enum i2400m_pt);



#ifdef CONFIG_DEBUG_FS

extern int i2400m_debugfs_add(struct i2400m *);

extern void i2400m_debugfs_rm(struct i2400m *);

int i2400m_debugfs_add(struct i2400m *);

void i2400m_debugfs_rm(struct i2400m *);

#else

static inline int i2400m_debugfs_add(struct i2400m *i2400m)

{
@@ -824,8 +823,8 @@ static inline void i2400m_debugfs_rm(struct i2400m *i2400m) {} 
#endif



/* Initialize/shutdown the device */

extern int i2400m_dev_initialize(struct i2400m *);

extern void i2400m_dev_shutdown(struct i2400m *);

int i2400m_dev_initialize(struct i2400m *);

void i2400m_dev_shutdown(struct i2400m *);



extern struct attribute_group i2400m_dev_attr_group;
@@ -873,21 +872,21 @@ void i2400m_put(struct i2400m *i2400m) 
	dev_put(i2400m->wimax_dev.net_dev);

}



extern int i2400m_dev_reset_handle(struct i2400m *, const char *);

extern int i2400m_pre_reset(struct i2400m *);

extern int i2400m_post_reset(struct i2400m *);

extern void i2400m_error_recovery(struct i2400m *);

int i2400m_dev_reset_handle(struct i2400m *, const char *);

int i2400m_pre_reset(struct i2400m *);

int i2400m_post_reset(struct i2400m *);

void i2400m_error_recovery(struct i2400m *);



/*

 * _setup()/_release() are called by the probe/disconnect functions of

 * the bus-specific drivers.

 */

extern int i2400m_setup(struct i2400m *, enum i2400m_bri bm_flags);

extern void i2400m_release(struct i2400m *);

int i2400m_setup(struct i2400m *, enum i2400m_bri bm_flags);

void i2400m_release(struct i2400m *);



extern int i2400m_rx(struct i2400m *, struct sk_buff *);

extern struct i2400m_msg_hdr *i2400m_tx_msg_get(struct i2400m *, size_t *);

extern void i2400m_tx_msg_sent(struct i2400m *);

int i2400m_rx(struct i2400m *, struct sk_buff *);

struct i2400m_msg_hdr *i2400m_tx_msg_get(struct i2400m *, size_t *);

void i2400m_tx_msg_sent(struct i2400m *);





/*
@@ -900,20 +899,19 @@ struct device *i2400m_dev(struct i2400m *i2400m) 
	return i2400m->wimax_dev.net_dev->dev.parent;

}



extern int i2400m_msg_check_status(const struct i2400m_l3l4_hdr *,

				   char *, size_t);

extern int i2400m_msg_size_check(struct i2400m *,

				 const struct i2400m_l3l4_hdr *, size_t);

extern struct sk_buff *i2400m_msg_to_dev(struct i2400m *, const void *, size_t);

extern void i2400m_msg_to_dev_cancel_wait(struct i2400m *, int);

extern void i2400m_report_hook(struct i2400m *,

			       const struct i2400m_l3l4_hdr *, size_t);

extern void i2400m_report_hook_work(struct work_struct *);

extern int i2400m_cmd_enter_powersave(struct i2400m *);

extern int i2400m_cmd_exit_idle(struct i2400m *);

extern struct sk_buff *i2400m_get_device_info(struct i2400m *);

extern int i2400m_firmware_check(struct i2400m *);

extern int i2400m_set_idle_timeout(struct i2400m *, unsigned);

int i2400m_msg_check_status(const struct i2400m_l3l4_hdr *, char *, size_t);

int i2400m_msg_size_check(struct i2400m *, const struct i2400m_l3l4_hdr *,

			  size_t);

struct sk_buff *i2400m_msg_to_dev(struct i2400m *, const void *, size_t);

void i2400m_msg_to_dev_cancel_wait(struct i2400m *, int);

void i2400m_report_hook(struct i2400m *, const struct i2400m_l3l4_hdr *,

			size_t);

void i2400m_report_hook_work(struct work_struct *);

int i2400m_cmd_enter_powersave(struct i2400m *);

int i2400m_cmd_exit_idle(struct i2400m *);

struct sk_buff *i2400m_get_device_info(struct i2400m *);

int i2400m_firmware_check(struct i2400m *);

int i2400m_set_idle_timeout(struct i2400m *, unsigned);



static inline

struct usb_endpoint_descriptor *usb_get_epd(struct usb_interface *iface, int ep)
@@ -921,10 +919,9 @@ struct usb_endpoint_descriptor *usb_get_epd(struct usb_interface *iface, int ep) 
	return &iface->cur_altsetting->endpoint[ep].desc;

}



extern int i2400m_op_rfkill_sw_toggle(struct wimax_dev *,

				      enum wimax_rf_state);

extern void i2400m_report_tlv_rf_switches_status(

	struct i2400m *, const struct i2400m_tlv_rf_switches_status *);

int i2400m_op_rfkill_sw_toggle(struct wimax_dev *, enum wimax_rf_state);

void i2400m_report_tlv_rf_switches_status(struct i2400m *,

					  const struct i2400m_tlv_rf_switches_status *);



/*

 * Helpers for firmware backwards compatibility
@@ -968,8 +965,8 @@ void __i2400m_msleep(unsigned ms) 




/* module initialization helpers */

extern int i2400m_barker_db_init(const char *);

extern void i2400m_barker_db_exit(void);

int i2400m_barker_db_init(const char *);

void i2400m_barker_db_exit(void);