From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/net/qla3xxx.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff -puN drivers/net/qla3xxx.c~git-qla3xxx-fixup drivers/net/qla3xxx.c --- a/drivers/net/qla3xxx.c~git-qla3xxx-fixup +++ a/drivers/net/qla3xxx.c @@ -3011,18 +3011,10 @@ static void ql3xxx_tx_timeout(struct net queue_delayed_work(qdev->workqueue, &qdev->tx_timeout_work, 0); } -<<<<<<< HEAD/drivers/net/qla3xxx.c static void ql_reset_work(struct work_struct *work) -======= -static void ql_reset_work(void *_data) ->>>>>>> /drivers/net/qla3xxx.c { -<<<<<<< HEAD/drivers/net/qla3xxx.c struct ql3_adapter *qdev = container_of(work, struct ql3_adapter, reset_work.work); -======= - struct ql3_adapter *qdev = _data; ->>>>>>> /drivers/net/qla3xxx.c struct net_device *ndev = qdev->ndev; struct ql3xxx_common_registers __iomem *regs = &qdev->ioaddr->CommonRegs; @@ -3101,22 +3093,12 @@ static void ql_reset_work(void *_data) ql_cycle_adapter(qdev, QL_NO_RESET); } -<<<<<<< HEAD/drivers/net/qla3xxx.c static void ql_tx_timeout_work(struct work_struct *work) -======= -static void ql_tx_timeout_work(void *_data) ->>>>>>> /drivers/net/qla3xxx.c { -<<<<<<< HEAD/drivers/net/qla3xxx.c struct ql3_adapter *qdev = container_of(work, struct ql3_adapter, tx_timeout_work.work); ql_cycle_adapter(qdev, QL_DO_RESET); -======= - struct ql3_adapter *qdev = _data; - - ql_cycle_adapter(qdev, QL_DO_RESET); ->>>>>>> /drivers/net/qla3xxx.c } static void ql_get_board_info(struct ql3_adapter *qdev) @@ -3292,13 +3274,8 @@ static int __devinit ql3xxx_probe(struct netif_stop_queue(ndev); qdev->workqueue = create_singlethread_workqueue(ndev->name); -<<<<<<< HEAD/drivers/net/qla3xxx.c INIT_DELAYED_WORK(&qdev->reset_work, ql_reset_work); INIT_DELAYED_WORK(&qdev->tx_timeout_work, ql_tx_timeout_work); -======= - INIT_WORK(&qdev->reset_work, ql_reset_work, qdev); - INIT_WORK(&qdev->tx_timeout_work, ql_tx_timeout_work, qdev); ->>>>>>> /drivers/net/qla3xxx.c init_timer(&qdev->adapter_timer); qdev->adapter_timer.function = ql3xxx_timer; _