Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

uio: uio_pruss: use struct device

Get rid of the repeating &dev->dev constructs and prevent introducing
new ones.

Signed-off-by: Andre Heider <a.heider@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Andre Heider and committed by
Greg Kroah-Hartman
4719ebfd 4847cc07

+19 -18
+19 -18
drivers/uio/uio_pruss.c
··· 91 91 return IRQ_HANDLED; 92 92 } 93 93 94 - static void pruss_cleanup(struct platform_device *dev, 95 - struct uio_pruss_dev *gdev) 94 + static void pruss_cleanup(struct device *dev, struct uio_pruss_dev *gdev) 96 95 { 97 96 int cnt; 98 97 struct uio_info *p = gdev->info; ··· 102 103 } 103 104 iounmap(gdev->prussio_vaddr); 104 105 if (gdev->ddr_vaddr) { 105 - dma_free_coherent(&dev->dev, extram_pool_sz, gdev->ddr_vaddr, 106 + dma_free_coherent(dev, extram_pool_sz, gdev->ddr_vaddr, 106 107 gdev->ddr_paddr); 107 108 } 108 109 if (gdev->sram_vaddr) ··· 114 115 kfree(gdev); 115 116 } 116 117 117 - static int pruss_probe(struct platform_device *dev) 118 + static int pruss_probe(struct platform_device *pdev) 118 119 { 119 120 struct uio_info *p; 120 121 struct uio_pruss_dev *gdev; 121 122 struct resource *regs_prussio; 123 + struct device *dev = &pdev->dev; 122 124 int ret = -ENODEV, cnt = 0, len; 123 - struct uio_pruss_pdata *pdata = dev_get_platdata(&dev->dev); 125 + struct uio_pruss_pdata *pdata = dev_get_platdata(dev); 124 126 125 127 gdev = kzalloc(sizeof(struct uio_pruss_dev), GFP_KERNEL); 126 128 if (!gdev) ··· 132 132 kfree(gdev); 133 133 return -ENOMEM; 134 134 } 135 + 135 136 /* Power on PRU in case its not done as part of boot-loader */ 136 - gdev->pruss_clk = clk_get(&dev->dev, "pruss"); 137 + gdev->pruss_clk = clk_get(dev, "pruss"); 137 138 if (IS_ERR(gdev->pruss_clk)) { 138 - dev_err(&dev->dev, "Failed to get clock\n"); 139 + dev_err(dev, "Failed to get clock\n"); 139 140 ret = PTR_ERR(gdev->pruss_clk); 140 141 kfree(gdev->info); 141 142 kfree(gdev); ··· 145 144 clk_enable(gdev->pruss_clk); 146 145 } 147 146 148 - regs_prussio = platform_get_resource(dev, IORESOURCE_MEM, 0); 147 + regs_prussio = platform_get_resource(pdev, IORESOURCE_MEM, 0); 149 148 if (!regs_prussio) { 150 - dev_err(&dev->dev, "No PRUSS I/O resource specified\n"); 149 + dev_err(dev, "No PRUSS I/O resource specified\n"); 151 150 goto out_free; 152 151 } 153 152 154 153 if (!regs_prussio->start) { 155 - dev_err(&dev->dev, "Invalid memory resource\n"); 154 + dev_err(dev, "Invalid memory resource\n"); 156 155 goto out_free; 157 156 } 158 157 ··· 162 161 (unsigned long)gen_pool_dma_alloc(gdev->sram_pool, 163 162 sram_pool_sz, &gdev->sram_paddr); 164 163 if (!gdev->sram_vaddr) { 165 - dev_err(&dev->dev, "Could not allocate SRAM pool\n"); 164 + dev_err(dev, "Could not allocate SRAM pool\n"); 166 165 goto out_free; 167 166 } 168 167 } 169 168 170 - gdev->ddr_vaddr = dma_alloc_coherent(&dev->dev, extram_pool_sz, 169 + gdev->ddr_vaddr = dma_alloc_coherent(dev, extram_pool_sz, 171 170 &(gdev->ddr_paddr), GFP_KERNEL | GFP_DMA); 172 171 if (!gdev->ddr_vaddr) { 173 - dev_err(&dev->dev, "Could not allocate external memory\n"); 172 + dev_err(dev, "Could not allocate external memory\n"); 174 173 goto out_free; 175 174 } 176 175 177 176 len = resource_size(regs_prussio); 178 177 gdev->prussio_vaddr = ioremap(regs_prussio->start, len); 179 178 if (!gdev->prussio_vaddr) { 180 - dev_err(&dev->dev, "Can't remap PRUSS I/O address range\n"); 179 + dev_err(dev, "Can't remap PRUSS I/O address range\n"); 181 180 goto out_free; 182 181 } 183 182 184 183 gdev->pintc_base = pdata->pintc_base; 185 - gdev->hostirq_start = platform_get_irq(dev, 0); 184 + gdev->hostirq_start = platform_get_irq(pdev, 0); 186 185 187 186 for (cnt = 0, p = gdev->info; cnt < MAX_PRUSS_EVT; cnt++, p++) { 188 187 p->mem[0].addr = regs_prussio->start; ··· 205 204 p->handler = pruss_handler; 206 205 p->priv = gdev; 207 206 208 - ret = uio_register_device(&dev->dev, p); 207 + ret = uio_register_device(dev, p); 209 208 if (ret < 0) 210 209 goto out_free; 211 210 } 212 211 213 - platform_set_drvdata(dev, gdev); 212 + platform_set_drvdata(pdev, gdev); 214 213 return 0; 215 214 216 215 out_free: ··· 222 221 { 223 222 struct uio_pruss_dev *gdev = platform_get_drvdata(dev); 224 223 225 - pruss_cleanup(dev, gdev); 224 + pruss_cleanup(&dev->dev, gdev); 226 225 return 0; 227 226 } 228 227