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

Staging: solo6x10: fixed assignments in if conditions in solo6010-core.c

This is a patch to the solo6010-core.c file that fixes the assignments
in if condition style issues found by the checkpatch.pl tool.

Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Prashant P. Shah and committed by
Greg Kroah-Hartman
15300c1d ebf993ba

+26 -14
+26 -14
drivers/staging/solo6x10/solo6010-core.c
··· 136 136 int ret; 137 137 int sdram; 138 138 u8 chip_id; 139 - 140 - if ((solo_dev = kzalloc(sizeof(*solo_dev), GFP_KERNEL)) == NULL) 139 + solo_dev = kzalloc(sizeof(*solo_dev), GFP_KERNEL); 140 + if (solo_dev == NULL) 141 141 return -ENOMEM; 142 142 143 143 solo_dev->pdev = pdev; 144 144 spin_lock_init(&solo_dev->reg_io_lock); 145 145 pci_set_drvdata(pdev, solo_dev); 146 146 147 - if ((ret = pci_enable_device(pdev))) 147 + ret = pci_enable_device(pdev); 148 + if (ret) 148 149 goto fail_probe; 149 150 150 151 pci_set_master(pdev); 151 152 152 - if ((ret = pci_request_regions(pdev, SOLO6010_NAME))) 153 + ret = pci_request_regions(pdev, SOLO6010_NAME); 154 + if (ret) 153 155 goto fail_probe; 154 156 155 - if ((solo_dev->reg_base = pci_ioremap_bar(pdev, 0)) == NULL) { 157 + solo_dev->reg_base = pci_ioremap_bar(pdev, 0); 158 + if (solo_dev->reg_base == NULL) { 156 159 ret = -ENOMEM; 157 160 goto fail_probe; 158 161 } ··· 201 198 /* Handle this from the start */ 202 199 solo6010_irq_on(solo_dev, SOLO_IRQ_PCI_ERR); 203 200 204 - if ((ret = solo_i2c_init(solo_dev))) 201 + ret = solo_i2c_init(solo_dev); 202 + if (ret) 205 203 goto fail_probe; 206 204 207 205 /* Setup the DMA engine */ ··· 214 210 SOLO_DMA_CTRL_READ_CLK_SELECT | 215 211 SOLO_DMA_CTRL_LATENCY(1)); 216 212 217 - if ((ret = solo_p2m_init(solo_dev))) 213 + ret = solo_p2m_init(solo_dev); 214 + if (ret) 218 215 goto fail_probe; 219 216 220 - if ((ret = solo_disp_init(solo_dev))) 217 + ret = solo_disp_init(solo_dev); 218 + if (ret) 221 219 goto fail_probe; 222 220 223 - if ((ret = solo_gpio_init(solo_dev))) 221 + ret = solo_gpio_init(solo_dev); 222 + if (ret) 224 223 goto fail_probe; 225 224 226 - if ((ret = solo_tw28_init(solo_dev))) 225 + ret = solo_tw28_init(solo_dev); 226 + if (ret) 227 227 goto fail_probe; 228 228 229 - if ((ret = solo_v4l2_init(solo_dev))) 229 + ret = solo_v4l2_init(solo_dev); 230 + if (ret) 230 231 goto fail_probe; 231 232 232 - if ((ret = solo_enc_init(solo_dev))) 233 + ret = solo_enc_init(solo_dev); 234 + if (ret) 233 235 goto fail_probe; 234 236 235 - if ((ret = solo_enc_v4l2_init(solo_dev))) 237 + ret = solo_enc_v4l2_init(solo_dev); 238 + if (ret) 236 239 goto fail_probe; 237 240 238 - if ((ret = solo_g723_init(solo_dev))) 241 + ret = solo_g723_init(solo_dev); 242 + if (ret) 239 243 goto fail_probe; 240 244 241 245 return 0;