cnic: Redefine BNX2X_HW_CID using existing bnx2x macros

[~andy/linux] / drivers / i2c / busses / i2c-pnx.c

diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index ce4097012e978eed7fc7caff18c12c8abeede5ea..5f39c6d8117a063b41406f589ccb722d85f4b9c9 100644 (file)
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -761,7 +761,6 @@ out_clkget:
 out_drvdata:
        kfree(alg_data);
 err_kzalloc:
-       platform_set_drvdata(pdev, NULL);
        return ret;
 }
 
@@ -776,7 +775,6 @@ static int i2c_pnx_remove(struct platform_device *pdev)
        release_mem_region(alg_data->base, I2C_PNX_REGION_SIZE);
        clk_put(alg_data->clk);
        kfree(alg_data);
-       platform_set_drvdata(pdev, NULL);
 
        return 0;
 }