diff options
author | Alexander Shiyan <shc_work@mail.ru> | 2013-11-29 06:39:28 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-09 01:41:48 -0500 |
commit | a0822637258b9e6132de669ac16dfe445c78e932 (patch) | |
tree | e5de355f6e2610df3f7f284daa666b73925d813a /drivers/w1 | |
parent | 5123662adc873f9a37d7898fe3c285a1f1af59c8 (diff) |
w1: mxc_w1: Remove unused field "clkdiv" from private structure
Private field "clkdiv" is not used outside "probe", so there are
no reason to keep it in driver.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1')
-rw-r--r-- | drivers/w1/masters/mxc_w1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index 15c7251b0556..5de3ca9b0fb9 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c | |||
@@ -46,7 +46,6 @@ | |||
46 | 46 | ||
47 | struct mxc_w1_device { | 47 | struct mxc_w1_device { |
48 | void __iomem *regs; | 48 | void __iomem *regs; |
49 | unsigned int clkdiv; | ||
50 | struct clk *clk; | 49 | struct clk *clk; |
51 | struct w1_bus_master bus_master; | 50 | struct w1_bus_master bus_master; |
52 | }; | 51 | }; |
@@ -107,6 +106,7 @@ static int mxc_w1_probe(struct platform_device *pdev) | |||
107 | { | 106 | { |
108 | struct mxc_w1_device *mdev; | 107 | struct mxc_w1_device *mdev; |
109 | struct resource *res; | 108 | struct resource *res; |
109 | unsigned int clkdiv; | ||
110 | int err = 0; | 110 | int err = 0; |
111 | 111 | ||
112 | mdev = devm_kzalloc(&pdev->dev, sizeof(struct mxc_w1_device), | 112 | mdev = devm_kzalloc(&pdev->dev, sizeof(struct mxc_w1_device), |
@@ -118,7 +118,7 @@ static int mxc_w1_probe(struct platform_device *pdev) | |||
118 | if (IS_ERR(mdev->clk)) | 118 | if (IS_ERR(mdev->clk)) |
119 | return PTR_ERR(mdev->clk); | 119 | return PTR_ERR(mdev->clk); |
120 | 120 | ||
121 | mdev->clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1; | 121 | clkdiv = (clk_get_rate(mdev->clk) / 1000000) - 1; |
122 | 122 | ||
123 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 123 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
124 | mdev->regs = devm_ioremap_resource(&pdev->dev, res); | 124 | mdev->regs = devm_ioremap_resource(&pdev->dev, res); |
@@ -126,7 +126,7 @@ static int mxc_w1_probe(struct platform_device *pdev) | |||
126 | return PTR_ERR(mdev->regs); | 126 | return PTR_ERR(mdev->regs); |
127 | 127 | ||
128 | clk_prepare_enable(mdev->clk); | 128 | clk_prepare_enable(mdev->clk); |
129 | __raw_writeb(mdev->clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER); | 129 | __raw_writeb(clkdiv, mdev->regs + MXC_W1_TIME_DIVIDER); |
130 | 130 | ||
131 | mdev->bus_master.data = mdev; | 131 | mdev->bus_master.data = mdev; |
132 | mdev->bus_master.reset_bus = mxc_w1_ds2_reset_bus; | 132 | mdev->bus_master.reset_bus = mxc_w1_ds2_reset_bus; |