|
@@ -659,9 +659,8 @@ static int i2c_pnx_probe(struct platform_device *pdev)
|
|
|
if (IS_ERR(alg_data->clk))
|
|
|
return PTR_ERR(alg_data->clk);
|
|
|
|
|
|
- init_timer(&alg_data->mif.timer);
|
|
|
- alg_data->mif.timer.function = i2c_pnx_timeout;
|
|
|
- alg_data->mif.timer.data = (unsigned long)alg_data;
|
|
|
+ setup_timer(&alg_data->mif.timer, i2c_pnx_timeout,
|
|
|
+ (unsigned long)alg_data);
|
|
|
|
|
|
snprintf(alg_data->adapter.name, sizeof(alg_data->adapter.name),
|
|
|
"%s", pdev->name);
|