drivers/net: fix up function prototypes after __dev* removals
The __dev* removal patches for the network drivers ended up messing up the function prototypes for a bunch of drivers. This patch fixes all of them back up to be properly aligned. Bonus is that this almost removes 100 lines of code, always a nice surprise. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
45122ca26c
commit
1dd06ae8db
@@ -974,8 +974,7 @@ static const struct net_device_ops cxgb_netdev_ops = {
|
||||
#endif
|
||||
};
|
||||
|
||||
static int init_one(struct pci_dev *pdev,
|
||||
const struct pci_device_id *ent)
|
||||
static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
{
|
||||
static int version_printed;
|
||||
|
||||
|
@@ -2059,8 +2059,7 @@ static void espibug_workaround(unsigned long data)
|
||||
/*
|
||||
* Creates a t1_sge structure and returns suggested resource parameters.
|
||||
*/
|
||||
struct sge *t1_sge_create(struct adapter *adapter,
|
||||
struct sge_params *p)
|
||||
struct sge *t1_sge_create(struct adapter *adapter, struct sge_params *p)
|
||||
{
|
||||
struct sge *sge = kzalloc(sizeof(*sge), GFP_KERNEL);
|
||||
int i;
|
||||
|
@@ -893,7 +893,7 @@ static void power_sequence_xpak(adapter_t* adapter)
|
||||
}
|
||||
|
||||
int t1_get_board_rev(adapter_t *adapter, const struct board_info *bi,
|
||||
struct adapter_params *p)
|
||||
struct adapter_params *p)
|
||||
{
|
||||
p->chip_version = bi->chip_term;
|
||||
p->is_asic = (p->chip_version != CHBT_TERM_FPGA);
|
||||
@@ -1029,7 +1029,7 @@ void t1_free_sw_modules(adapter_t *adapter)
|
||||
}
|
||||
|
||||
static void init_link_config(struct link_config *lc,
|
||||
const struct board_info *bi)
|
||||
const struct board_info *bi)
|
||||
{
|
||||
lc->supported = bi->caps;
|
||||
lc->requested_speed = lc->speed = SPEED_INVALID;
|
||||
@@ -1049,8 +1049,7 @@ static void init_link_config(struct link_config *lc,
|
||||
* Allocate and initialize the data structures that hold the SW state of
|
||||
* the Terminator HW modules.
|
||||
*/
|
||||
int t1_init_sw_modules(adapter_t *adapter,
|
||||
const struct board_info *bi)
|
||||
int t1_init_sw_modules(adapter_t *adapter, const struct board_info *bi)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
|
@@ -3108,8 +3108,7 @@ static int cxgb_enable_msix(struct adapter *adap)
|
||||
return err;
|
||||
}
|
||||
|
||||
static void print_port_info(struct adapter *adap,
|
||||
const struct adapter_info *ai)
|
||||
static void print_port_info(struct adapter *adap, const struct adapter_info *ai)
|
||||
{
|
||||
static const char *pci_variant[] = {
|
||||
"PCI", "PCI-X", "PCI-X ECC", "PCI-X 266", "PCI Express"
|
||||
@@ -3176,8 +3175,7 @@ static void cxgb3_init_iscsi_mac(struct net_device *dev)
|
||||
#define TSO_FLAGS (NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_TSO_ECN)
|
||||
#define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | TSO_FLAGS | \
|
||||
NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA)
|
||||
static int init_one(struct pci_dev *pdev,
|
||||
const struct pci_device_id *ent)
|
||||
static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
{
|
||||
static int version_printed;
|
||||
|
||||
|
@@ -2149,7 +2149,7 @@ static const struct file_operations mem_debugfs_fops = {
|
||||
};
|
||||
|
||||
static void add_debugfs_mem(struct adapter *adap, const char *name,
|
||||
unsigned int idx, unsigned int size_mb)
|
||||
unsigned int idx, unsigned int size_mb)
|
||||
{
|
||||
struct dentry *de;
|
||||
|
||||
@@ -4419,8 +4419,7 @@ static void free_some_resources(struct adapter *adapter)
|
||||
#define VLAN_FEAT (NETIF_F_SG | NETIF_F_IP_CSUM | TSO_FLAGS | \
|
||||
NETIF_F_IPV6_CSUM | NETIF_F_HIGHDMA)
|
||||
|
||||
static int init_one(struct pci_dev *pdev,
|
||||
const struct pci_device_id *ent)
|
||||
static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
{
|
||||
int func, i, err;
|
||||
struct port_info *pi;
|
||||
|
@@ -3440,8 +3440,7 @@ int t4_handle_fw_rpl(struct adapter *adap, const __be64 *rpl)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void get_pci_mode(struct adapter *adapter,
|
||||
struct pci_params *p)
|
||||
static void get_pci_mode(struct adapter *adapter, struct pci_params *p)
|
||||
{
|
||||
u16 val;
|
||||
|
||||
@@ -3460,8 +3459,7 @@ static void get_pci_mode(struct adapter *adapter,
|
||||
* Initializes the SW state maintained for each link, including the link's
|
||||
* capabilities and default speed/flow-control/autonegotiation settings.
|
||||
*/
|
||||
static void init_link_config(struct link_config *lc,
|
||||
unsigned int caps)
|
||||
static void init_link_config(struct link_config *lc, unsigned int caps)
|
||||
{
|
||||
lc->supported = caps;
|
||||
lc->requested_speed = 0;
|
||||
|
@@ -2463,7 +2463,7 @@ static const struct net_device_ops cxgb4vf_netdev_ops = {
|
||||
* the PF Driver ...
|
||||
*/
|
||||
static int cxgb4vf_pci_probe(struct pci_dev *pdev,
|
||||
const struct pci_device_id *ent)
|
||||
const struct pci_device_id *ent)
|
||||
{
|
||||
static int version_printed;
|
||||
|
||||
|
@@ -253,8 +253,7 @@ static int hash_mac_addr(const u8 *addr)
|
||||
* Initializes the SW state maintained for each link, including the link's
|
||||
* capabilities and default speed/flow-control/autonegotiation settings.
|
||||
*/
|
||||
static void init_link_config(struct link_config *lc,
|
||||
unsigned int caps)
|
||||
static void init_link_config(struct link_config *lc, unsigned int caps)
|
||||
{
|
||||
lc->supported = caps;
|
||||
lc->requested_speed = 0;
|
||||
|
Reference in New Issue
Block a user