projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/atheros: remove __dev* attributes
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
atheros
/
atl1c
/
atl1c_main.c
diff --git
a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index d19f82f7597a6c3e079a71dffc727cd5fbd9cd21..44bee4a2b9b348ed1dffa352f57d0177afd46eca 100644
(file)
--- a/
drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/
drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@
-643,7
+643,7
@@
static int atl1c_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
* @adapter: board private structure to initialize
*
*/
* @adapter: board private structure to initialize
*
*/
-static int
__devinit
atl1c_alloc_queues(struct atl1c_adapter *adapter)
+static int atl1c_alloc_queues(struct atl1c_adapter *adapter)
{
return 0;
}
{
return 0;
}
@@
-702,7
+702,7
@@
struct atl1c_platform_patch {
u32 patch_flag;
#define ATL1C_LINK_PATCH 0x1
};
u32 patch_flag;
#define ATL1C_LINK_PATCH 0x1
};
-static const struct atl1c_platform_patch plats[]
__devinitconst
= {
+static const struct atl1c_platform_patch plats[] = {
{0x2060, 0xC1, 0x1019, 0x8152, 0x1},
{0x2060, 0xC1, 0x1019, 0x2060, 0x1},
{0x2060, 0xC1, 0x1019, 0xE000, 0x1},
{0x2060, 0xC1, 0x1019, 0x8152, 0x1},
{0x2060, 0xC1, 0x1019, 0x2060, 0x1},
{0x2060, 0xC1, 0x1019, 0xE000, 0x1},
@@
-725,7
+725,7
@@
static const struct atl1c_platform_patch plats[] __devinitconst = {
{0},
};
{0},
};
-static void
__devinit
atl1c_patch_assign(struct atl1c_hw *hw)
+static void atl1c_patch_assign(struct atl1c_hw *hw)
{
struct pci_dev *pdev = hw->adapter->pdev;
u32 misc_ctrl;
{
struct pci_dev *pdev = hw->adapter->pdev;
u32 misc_ctrl;
@@
-764,7
+764,7
@@
static void __devinit atl1c_patch_assign(struct atl1c_hw *hw)
* Fields are initialized based on PCI device information and
* OS network device settings (MTU size).
*/
* Fields are initialized based on PCI device information and
* OS network device settings (MTU size).
*/
-static int
__devinit
atl1c_sw_init(struct atl1c_adapter *adapter)
+static int atl1c_sw_init(struct atl1c_adapter *adapter)
{
struct atl1c_hw *hw = &adapter->hw;
struct pci_dev *pdev = adapter->pdev;
{
struct atl1c_hw *hw = &adapter->hw;
struct pci_dev *pdev = adapter->pdev;
@@
-2442,7
+2442,7
@@
static int atl1c_init_netdev(struct net_device *netdev, struct pci_dev *pdev)
* The OS initialization, configuring of the adapter private structure,
* and a hardware reset occur.
*/
* The OS initialization, configuring of the adapter private structure,
* and a hardware reset occur.
*/
-static int
__devinit
atl1c_probe(struct pci_dev *pdev,
+static int atl1c_probe(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
struct net_device *netdev;
const struct pci_device_id *ent)
{
struct net_device *netdev;
@@
-2587,7
+2587,7
@@
err_dma:
* Hot-Plug event, or because the driver is going to be removed from
* memory.
*/
* Hot-Plug event, or because the driver is going to be removed from
* memory.
*/
-static void
__devexit
atl1c_remove(struct pci_dev *pdev)
+static void atl1c_remove(struct pci_dev *pdev)
{
struct net_device *netdev = pci_get_drvdata(pdev);
struct atl1c_adapter *adapter = netdev_priv(netdev);
{
struct net_device *netdev = pci_get_drvdata(pdev);
struct atl1c_adapter *adapter = netdev_priv(netdev);
@@
-2697,7
+2697,7
@@
static struct pci_driver atl1c_driver = {
.name = atl1c_driver_name,
.id_table = atl1c_pci_tbl,
.probe = atl1c_probe,
.name = atl1c_driver_name,
.id_table = atl1c_pci_tbl,
.probe = atl1c_probe,
- .remove =
__devexit_p(atl1c_remove)
,
+ .remove =
atl1c_remove
,
.shutdown = atl1c_shutdown,
.err_handler = &atl1c_err_handler,
.driver.pm = &atl1c_pm_ops,
.shutdown = atl1c_shutdown,
.err_handler = &atl1c_err_handler,
.driver.pm = &atl1c_pm_ops,