.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
---|
1 | 2 | /* |
---|
2 | 3 | * CE4100 PCI-I2C glue code for PXA's driver |
---|
3 | 4 | * Author: Sebastian Andrzej Siewior <bigeasy@linutronix.de> |
---|
4 | | - * License: GPL v2 |
---|
5 | 5 | * |
---|
6 | 6 | * The CE4100's I2C device is more or less the same one as found on PXA. |
---|
7 | 7 | * It does not support slave mode, the register slightly moved. This PCI |
---|
.. | .. |
---|
105 | 105 | int i; |
---|
106 | 106 | struct ce4100_devices *sds; |
---|
107 | 107 | |
---|
108 | | - ret = pci_enable_device_mem(dev); |
---|
| 108 | + ret = pcim_enable_device(dev); |
---|
109 | 109 | if (ret) |
---|
110 | 110 | return ret; |
---|
111 | 111 | |
---|
.. | .. |
---|
114 | 114 | return -EINVAL; |
---|
115 | 115 | } |
---|
116 | 116 | sds = kzalloc(sizeof(*sds), GFP_KERNEL); |
---|
117 | | - if (!sds) { |
---|
118 | | - ret = -ENOMEM; |
---|
119 | | - goto err_mem; |
---|
120 | | - } |
---|
| 117 | + if (!sds) |
---|
| 118 | + return -ENOMEM; |
---|
121 | 119 | |
---|
122 | 120 | for (i = 0; i < ARRAY_SIZE(sds->pdev); i++) { |
---|
123 | 121 | sds->pdev[i] = add_i2c_device(dev, i); |
---|
.. | .. |
---|
133 | 131 | |
---|
134 | 132 | err_dev_add: |
---|
135 | 133 | kfree(sds); |
---|
136 | | -err_mem: |
---|
137 | | - pci_disable_device(dev); |
---|
138 | 134 | return ret; |
---|
139 | 135 | } |
---|
140 | 136 | |
---|