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

Commit 9c2a4c20 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: aquantia: Remove IOSSv1 glue driver"

parents 6259297d 5ae4f27b

drivers/net/ethernet/aquantia/atlantic-fwd/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -51,11 +51,3 @@ config ATLFWD_FWD_NETLINK 


endif

config AQFWD_QCOM_IPA

	bool "QTI IPA offload support"

	depends on IPA_ETH

	depends on AQFWD

	select ATLFWD_FWD

	help

	  Enable support for Qualcomm Technologies, Inc. IPA (Internet Protocol Accelerator).

	  If unsure, say N.

drivers/net/ethernet/aquantia/atlantic-fwd/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -27,6 +27,4 @@ atlantic-fwd-$(CONFIG_ATLFWD_FWD_NETLINK) += atl_fwdnl.o \ 
					      atl_fwdnl_params.o

atlantic-fwd-$(CONFIG_MACSEC) += atl_macsec.o macsec/macsec_api.o



atlantic-fwd-$(CONFIG_AQFWD_QCOM_IPA) += atl_ipa.o



ccflags-y += -I$(src)

drivers/net/ethernet/aquantia/atlantic-fwd/atl_ipa.c

deleted100644 → 0
+0 −1146

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/aquantia/atlantic-fwd/atl_ipa.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.

 */



#ifndef _ATL_IPA_H_

#define _ATL_IPA_H_



#include <linux/pci.h>



#if IS_ENABLED(CONFIG_AQFWD_QCOM_IPA)



int atl_ipa_register(struct pci_driver *drv);

void atl_ipa_unregister(struct pci_driver *drv);



#else



static inline int atl_ipa_register(struct pci_driver *drv)

{

	return 0;

}



static inline void atl_ipa_unregister(struct pci_driver *drv)

{ }



#endif /* CONFIG_AQFWD_QCOM_IPA */



#endif /* _ATL_IPA_H_ */

drivers/net/ethernet/aquantia/atlantic-fwd/atl_main.c

+0 −13
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
#include "atl_macsec.h"

#include "atl_ptp.h"



#include "atl_ipa.h"



const char atl_driver_name[] = "atlantic-fwd";



unsigned int atl_max_queues = ATL_MAX_QUEUES;
@@ -1037,13 +1035,6 @@ static int __init atl_module_init(void) 
		return -ENOMEM;

	}



	ret = atl_ipa_register(&atl_pci_ops);

	if (ret) {

		pr_err("%s: Failed to register driver with platform\n",

		       atl_driver_name);

		goto err_ipa_reg;

	}



	ret = pci_register_driver(&atl_pci_ops);

	if (ret)

		goto err_pci_reg;
@@ -1061,8 +1052,6 @@ static int __init atl_module_init(void) 
#endif

	pci_unregister_driver(&atl_pci_ops);

err_pci_reg:

	atl_ipa_unregister(&atl_pci_ops);

err_ipa_reg:

	destroy_workqueue(atl_wq);

	return ret;

}
@@ -1076,8 +1065,6 @@ static void __exit atl_module_exit(void) 


	pci_unregister_driver(&atl_pci_ops);



	atl_ipa_unregister(&atl_pci_ops);



	if (atl_wq) {

		destroy_workqueue(atl_wq);

		atl_wq = NULL;