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

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

Merge branch 'hns3-misc-cleanups' 



Salil Mehta says:

====================
Misc. cleanups for HNS3 ethernet driver

This patch-set presents some cleanups for HNS3 Ethernet Driver.
====================

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

drivers/net/ethernet/hisilicon/hns3/hnae3.c

+2 −8
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2017 Hisilicon Limited.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */

// SPDX-License-Identifier: GPL-2.0+

// Copyright (c) 2016-2017 Hisilicon Limited.



#include <linux/list.h>

#include <linux/spinlock.h>

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+2 −8
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2017 Hisilicon Limited.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */

// SPDX-License-Identifier: GPL-2.0+

// Copyright (c) 2016-2017 Hisilicon Limited.



#ifndef __HNAE3_H

#define __HNAE3_H

drivers/net/ethernet/hisilicon/hns3/hns3_dcbnl.c

+2 −8
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2017 Hisilicon Limited.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */

// SPDX-License-Identifier: GPL-2.0+

// Copyright (c) 2016-2017 Hisilicon Limited.



#include "hnae3.h"

#include "hns3_enet.h"

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+4 −10
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016~2017 Hisilicon Limited.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */

// SPDX-License-Identifier: GPL-2.0+

// Copyright (c) 2016-2017 Hisilicon Limited.



#include <linux/dma-mapping.h>

#include <linux/etherdevice.h>
@@ -62,9 +56,9 @@ static const struct pci_device_id hns3_pci_tbl[] = { 
};

MODULE_DEVICE_TABLE(pci, hns3_pci_tbl);



static irqreturn_t hns3_irq_handle(int irq, void *dev)

static irqreturn_t hns3_irq_handle(int irq, void *vector)

{

	struct hns3_enet_tqp_vector *tqp_vector = dev;

	struct hns3_enet_tqp_vector *tqp_vector = vector;



	napi_schedule(&tqp_vector->napi);

drivers/net/ethernet/hisilicon/hns3/hns3_enet.h

+2 −8
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016 Hisilicon Limited.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */

// SPDX-License-Identifier: GPL-2.0+

// Copyright (c) 2016-2017 Hisilicon Limited.



#ifndef __HNS3_ENET_H

#define __HNS3_ENET_H