summaryrefslogtreecommitdiff
path: root/drivers/iio
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/buffer/industrialio-buffer-cb.c2
-rw-r--r--drivers/iio/buffer/industrialio-buffer-dma.c2
-rw-r--r--drivers/iio/buffer/industrialio-buffer-dmaengine.c2
-rw-r--r--drivers/iio/buffer/industrialio-hw-consumer.c2
-rw-r--r--drivers/iio/buffer/kfifo_buf.c2
-rw-r--r--drivers/iio/common/ssp_sensors/ssp_spi.c2
-rw-r--r--drivers/iio/dummy/iio_dummy_evgen.c2
-rw-r--r--drivers/iio/dummy/iio_simple_dummy.c2
-rw-r--r--drivers/iio/dummy/iio_simple_dummy_buffer.c2
-rw-r--r--drivers/iio/imu/adis_buffer.c4
-rw-r--r--drivers/iio/industrialio-buffer.c16
-rw-r--r--drivers/iio/industrialio-core.c4
-rw-r--r--drivers/iio/industrialio-event.c2
-rw-r--r--drivers/iio/industrialio-gts-helper.c6
-rw-r--r--drivers/iio/industrialio-trigger.c4
-rw-r--r--drivers/iio/inkern.c8
-rw-r--r--drivers/iio/trigger/iio-trig-hrtimer.c2
-rw-r--r--drivers/iio/trigger/iio-trig-interrupt.c2
-rw-r--r--drivers/iio/trigger/iio-trig-loop.c2
-rw-r--r--drivers/iio/trigger/iio-trig-sysfs.c2
20 files changed, 35 insertions, 35 deletions
diff --git a/drivers/iio/buffer/industrialio-buffer-cb.c b/drivers/iio/buffer/industrialio-buffer-cb.c
index 7a251b030b7e..0c266c216525 100644
--- a/drivers/iio/buffer/industrialio-buffer-cb.c
+++ b/drivers/iio/buffer/industrialio-buffer-cb.c
@@ -60,7 +60,7 @@ struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,
return ERR_PTR(-EINVAL);
}
- cb_buff = kzalloc_obj(*cb_buff, GFP_KERNEL);
+ cb_buff = kzalloc_obj(*cb_buff);
if (cb_buff == NULL)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iio/buffer/industrialio-buffer-dma.c b/drivers/iio/buffer/industrialio-buffer-dma.c
index 2425e1113a7d..1daac23087a7 100644
--- a/drivers/iio/buffer/industrialio-buffer-dma.c
+++ b/drivers/iio/buffer/industrialio-buffer-dma.c
@@ -174,7 +174,7 @@ iio_dma_buffer_alloc_block(struct iio_dma_buffer_queue *queue, size_t size,
bool fileio)
{
struct iio_dma_buffer_block *block __free(kfree) =
- kzalloc_obj(*block, GFP_KERNEL);
+ kzalloc_obj(*block);
if (!block)
return NULL;
diff --git a/drivers/iio/buffer/industrialio-buffer-dmaengine.c b/drivers/iio/buffer/industrialio-buffer-dmaengine.c
index 23b4ac7cca9c..98acce909854 100644
--- a/drivers/iio/buffer/industrialio-buffer-dmaengine.c
+++ b/drivers/iio/buffer/industrialio-buffer-dmaengine.c
@@ -224,7 +224,7 @@ static struct iio_buffer *iio_dmaengine_buffer_alloc(struct dma_chan *chan)
if (ret < 0)
return ERR_PTR(ret);
- dmaengine_buffer = kzalloc_obj(*dmaengine_buffer, GFP_KERNEL);
+ dmaengine_buffer = kzalloc_obj(*dmaengine_buffer);
if (!dmaengine_buffer)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iio/buffer/industrialio-hw-consumer.c b/drivers/iio/buffer/industrialio-hw-consumer.c
index 9745b3bd4ac7..51e3b360584f 100644
--- a/drivers/iio/buffer/industrialio-hw-consumer.c
+++ b/drivers/iio/buffer/industrialio-hw-consumer.c
@@ -87,7 +87,7 @@ struct iio_hw_consumer *iio_hw_consumer_alloc(struct device *dev)
struct iio_channel *chan;
int ret;
- hwc = kzalloc_obj(*hwc, GFP_KERNEL);
+ hwc = kzalloc_obj(*hwc);
if (!hwc)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iio/buffer/kfifo_buf.c b/drivers/iio/buffer/kfifo_buf.c
index 73e2cd7e7313..a6ff9085b8a2 100644
--- a/drivers/iio/buffer/kfifo_buf.c
+++ b/drivers/iio/buffer/kfifo_buf.c
@@ -204,7 +204,7 @@ struct iio_buffer *iio_kfifo_allocate(void)
{
struct iio_kfifo *kf;
- kf = kzalloc_obj(*kf, GFP_KERNEL);
+ kf = kzalloc_obj(*kf);
if (!kf)
return NULL;
diff --git a/drivers/iio/common/ssp_sensors/ssp_spi.c b/drivers/iio/common/ssp_sensors/ssp_spi.c
index 5fd9ef819417..6c81c0385fb5 100644
--- a/drivers/iio/common/ssp_sensors/ssp_spi.c
+++ b/drivers/iio/common/ssp_sensors/ssp_spi.c
@@ -77,7 +77,7 @@ static struct ssp_msg *ssp_create_msg(u8 cmd, u16 len, u16 opt, u32 data)
struct ssp_msg_header h;
struct ssp_msg *msg;
- msg = kzalloc_obj(*msg, GFP_KERNEL);
+ msg = kzalloc_obj(*msg);
if (!msg)
return NULL;
diff --git a/drivers/iio/dummy/iio_dummy_evgen.c b/drivers/iio/dummy/iio_dummy_evgen.c
index 84bc2281c03a..30f0ae7c5116 100644
--- a/drivers/iio/dummy/iio_dummy_evgen.c
+++ b/drivers/iio/dummy/iio_dummy_evgen.c
@@ -47,7 +47,7 @@ static int iio_dummy_evgen_create(void)
{
int ret;
- iio_evgen = kzalloc_obj(*iio_evgen, GFP_KERNEL);
+ iio_evgen = kzalloc_obj(*iio_evgen);
if (!iio_evgen)
return -ENOMEM;
diff --git a/drivers/iio/dummy/iio_simple_dummy.c b/drivers/iio/dummy/iio_simple_dummy.c
index cba19b6a23cb..19fcdbbc11c6 100644
--- a/drivers/iio/dummy/iio_simple_dummy.c
+++ b/drivers/iio/dummy/iio_simple_dummy.c
@@ -588,7 +588,7 @@ static struct iio_sw_device *iio_dummy_probe(const char *name)
* parent = &client->dev;
*/
- swd = kzalloc_obj(*swd, GFP_KERNEL);
+ swd = kzalloc_obj(*swd);
if (!swd)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iio/dummy/iio_simple_dummy_buffer.c b/drivers/iio/dummy/iio_simple_dummy_buffer.c
index 5bbfda407bc2..57f3611a86d9 100644
--- a/drivers/iio/dummy/iio_simple_dummy_buffer.c
+++ b/drivers/iio/dummy/iio_simple_dummy_buffer.c
@@ -60,7 +60,7 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p)
* - A buffer at the end of the structure accessed via iio_priv()
* that is marked __aligned(IIO_DMA_MINALIGN).
*/
- scan = kzalloc_obj(*scan, GFP_KERNEL);
+ scan = kzalloc_obj(*scan);
if (!scan)
goto done;
diff --git a/drivers/iio/imu/adis_buffer.c b/drivers/iio/imu/adis_buffer.c
index 222b77781639..501da4eaef69 100644
--- a/drivers/iio/imu/adis_buffer.c
+++ b/drivers/iio/imu/adis_buffer.c
@@ -33,7 +33,7 @@ static int adis_update_scan_mode_burst(struct iio_dev *indio_dev,
else
burst_max_length = burst_length;
- adis->xfer = kzalloc_objs(*adis->xfer, 2, GFP_KERNEL);
+ adis->xfer = kzalloc_objs(*adis->xfer, 2);
if (!adis->xfer)
return -ENOMEM;
@@ -81,7 +81,7 @@ int adis_update_scan_mode(struct iio_dev *indio_dev,
scan_count = indio_dev->scan_bytes / 2;
- adis->xfer = kzalloc_objs(*adis->xfer, scan_count + 1, GFP_KERNEL);
+ adis->xfer = kzalloc_objs(*adis->xfer, scan_count + 1);
if (!adis->xfer)
return -ENOMEM;
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index ac141289a2f3..f15a180dc49e 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -1024,7 +1024,7 @@ static int iio_buffer_add_demux(struct iio_buffer *buffer,
(*p)->to + (*p)->length == out_loc) {
(*p)->length += length;
} else {
- *p = kmalloc_obj(**p, GFP_KERNEL);
+ *p = kmalloc_obj(**p);
if (!(*p))
return -ENOMEM;
(*p)->from = in_loc;
@@ -1478,7 +1478,7 @@ static struct attribute *iio_buffer_wrap_attr(struct iio_buffer *buffer,
struct device_attribute *dattr = to_dev_attr(attr);
struct iio_dev_attr *iio_attr;
- iio_attr = kzalloc_obj(*iio_attr, GFP_KERNEL);
+ iio_attr = kzalloc_obj(*iio_attr);
if (!iio_attr)
return NULL;
@@ -1507,7 +1507,7 @@ static int iio_buffer_register_legacy_sysfs_groups(struct iio_dev *indio_dev,
struct attribute **attrs;
int ret;
- attrs = kzalloc_objs(*attrs, buffer_attrcount + 1, GFP_KERNEL);
+ attrs = kzalloc_objs(*attrs, buffer_attrcount + 1);
if (!attrs)
return -ENOMEM;
@@ -1521,7 +1521,7 @@ static int iio_buffer_register_legacy_sysfs_groups(struct iio_dev *indio_dev,
if (ret)
goto error_free_buffer_attrs;
- attrs = kzalloc_objs(*attrs, scan_el_attrcount + 1, GFP_KERNEL);
+ attrs = kzalloc_objs(*attrs, scan_el_attrcount + 1);
if (!attrs) {
ret = -ENOMEM;
goto error_free_buffer_attrs;
@@ -1674,7 +1674,7 @@ static int iio_buffer_attach_dmabuf(struct iio_dev_buffer_pair *ib,
if (copy_from_user(&fd, user_fd, sizeof(fd)))
return -EFAULT;
- priv = kzalloc_obj(*priv, GFP_KERNEL);
+ priv = kzalloc_obj(*priv);
if (!priv)
return -ENOMEM;
@@ -1862,7 +1862,7 @@ static int iio_buffer_enqueue_dmabuf(struct iio_dev_buffer_pair *ib,
priv = attach->importer_priv;
- fence = kmalloc_obj(*fence, GFP_KERNEL);
+ fence = kmalloc_obj(*fence);
if (!fence) {
ret = -ENOMEM;
goto err_attachment_put;
@@ -2035,7 +2035,7 @@ static long iio_device_buffer_getfd(struct iio_dev *indio_dev, unsigned long arg
goto error_iio_dev_put;
}
- ib = kzalloc_obj(*ib, GFP_KERNEL);
+ ib = kzalloc_obj(*ib);
if (!ib) {
ret = -ENOMEM;
goto error_clear_busy_bit;
@@ -2182,7 +2182,7 @@ static int __iio_buffer_alloc_sysfs_and_mask(struct iio_buffer *buffer,
}
attrn = buffer_attrcount + scan_el_attrcount;
- attr = kzalloc_objs(*attr, attrn + 1, GFP_KERNEL);
+ attr = kzalloc_objs(*attr, attrn + 1);
if (!attr) {
ret = -ENOMEM;
goto error_free_scan_mask;
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 9e3d23368413..d4a9dd889eef 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -1192,7 +1192,7 @@ int __iio_add_chan_devattr(const char *postfix,
int ret;
struct iio_dev_attr *iio_attr, *t;
- iio_attr = kzalloc_obj(*iio_attr, GFP_KERNEL);
+ iio_attr = kzalloc_obj(*iio_attr);
if (iio_attr == NULL)
return -ENOMEM;
ret = __iio_device_attr_init(&iio_attr->dev_attr,
@@ -1796,7 +1796,7 @@ static int iio_chrdev_open(struct inode *inode, struct file *filp)
iio_device_get(indio_dev);
- ib = kmalloc_obj(*ib, GFP_KERNEL);
+ ib = kmalloc_obj(*ib);
if (!ib) {
iio_device_put(indio_dev);
clear_bit(IIO_BUSY_BIT_POS, &iio_dev_opaque->flags);
diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c
index 43043ea897e0..d71cb9fd09a3 100644
--- a/drivers/iio/industrialio-event.c
+++ b/drivers/iio/industrialio-event.c
@@ -583,7 +583,7 @@ int iio_device_register_eventset(struct iio_dev *indio_dev)
iio_check_for_dynamic_events(indio_dev)))
return 0;
- ev_int = kzalloc_obj(*ev_int, GFP_KERNEL);
+ ev_int = kzalloc_obj(*ev_int);
if (!ev_int)
return -ENOMEM;
diff --git a/drivers/iio/industrialio-gts-helper.c b/drivers/iio/industrialio-gts-helper.c
index d7b52ca256b2..4f52dc373abf 100644
--- a/drivers/iio/industrialio-gts-helper.c
+++ b/drivers/iio/industrialio-gts-helper.c
@@ -250,12 +250,12 @@ static int iio_gts_alloc_int_table_array(int ***arr, int num_tables, int num_tab
{
int i, **tmp;
- tmp = kzalloc_objs(**arr, num_tables, GFP_KERNEL);
+ tmp = kzalloc_objs(**arr, num_tables);
if (!tmp)
return -ENOMEM;
for (i = 0; i < num_tables; i++) {
- tmp[i] = kzalloc_objs(int, num_table_items, GFP_KERNEL);
+ tmp[i] = kzalloc_objs(int, num_table_items);
if (!tmp[i])
goto err_free;
}
@@ -432,7 +432,7 @@ static int iio_gts_build_avail_time_table(struct iio_gts *gts)
if (!gts->num_itime)
return 0;
- times = kzalloc_objs(int, gts->num_itime, GFP_KERNEL);
+ times = kzalloc_objs(int, gts->num_itime);
if (!times)
return -ENOMEM;
diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index 97a808554609..7f34fe7bad07 100644
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -372,7 +372,7 @@ struct iio_poll_func
va_list vargs;
struct iio_poll_func *pf;
- pf = kmalloc_obj(*pf, GFP_KERNEL);
+ pf = kmalloc_obj(*pf);
if (!pf)
return NULL;
va_start(vargs, fmt);
@@ -557,7 +557,7 @@ struct iio_trigger *viio_trigger_alloc(struct device *parent,
struct iio_trigger *trig;
int i;
- trig = kzalloc_obj(*trig, GFP_KERNEL);
+ trig = kzalloc_obj(*trig);
if (!trig)
return NULL;
diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
index 44600bc1b879..0df0ab3de270 100644
--- a/drivers/iio/inkern.c
+++ b/drivers/iio/inkern.c
@@ -55,7 +55,7 @@ int iio_map_array_register(struct iio_dev *indio_dev, const struct iio_map *maps
guard(mutex)(&iio_map_list_lock);
while (maps[i].consumer_dev_name) {
- mapi = kzalloc_obj(*mapi, GFP_KERNEL);
+ mapi = kzalloc_obj(*mapi);
if (!mapi) {
ret = -ENOMEM;
goto error_ret;
@@ -188,7 +188,7 @@ static struct iio_channel *fwnode_iio_channel_get(struct fwnode_handle *fwnode,
return ERR_PTR(-EINVAL);
struct iio_channel *channel __free(kfree) =
- kzalloc_obj(*channel, GFP_KERNEL);
+ kzalloc_obj(*channel);
if (!channel)
return ERR_PTR(-ENOMEM);
@@ -302,7 +302,7 @@ static struct iio_channel *fwnode_iio_channel_get_all(struct device *dev)
/* NULL terminated array to save passing size */
struct iio_channel *chans __free(kfree) =
- kzalloc_objs(*chans, nummaps + 1, GFP_KERNEL);
+ kzalloc_objs(*chans, nummaps + 1);
if (!chans)
return ERR_PTR(-ENOMEM);
@@ -474,7 +474,7 @@ struct iio_channel *iio_channel_get_all(struct device *dev)
/* NULL terminated array to save passing size */
struct iio_channel *chans __free(kfree) =
- kzalloc_objs(*chans, nummaps + 1, GFP_KERNEL);
+ kzalloc_objs(*chans, nummaps + 1);
if (!chans)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iio/trigger/iio-trig-hrtimer.c b/drivers/iio/trigger/iio-trig-hrtimer.c
index 02f137ace26d..57550b581593 100644
--- a/drivers/iio/trigger/iio-trig-hrtimer.c
+++ b/drivers/iio/trigger/iio-trig-hrtimer.c
@@ -131,7 +131,7 @@ static struct iio_sw_trigger *iio_trig_hrtimer_probe(const char *name)
struct iio_hrtimer_info *trig_info;
int ret;
- trig_info = kzalloc_obj(*trig_info, GFP_KERNEL);
+ trig_info = kzalloc_obj(*trig_info);
if (!trig_info)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iio/trigger/iio-trig-interrupt.c b/drivers/iio/trigger/iio-trig-interrupt.c
index 432c9b2f2c64..a100c2e3a0d9 100644
--- a/drivers/iio/trigger/iio-trig-interrupt.c
+++ b/drivers/iio/trigger/iio-trig-interrupt.c
@@ -48,7 +48,7 @@ static int iio_interrupt_trigger_probe(struct platform_device *pdev)
goto error_ret;
}
- trig_info = kzalloc_obj(*trig_info, GFP_KERNEL);
+ trig_info = kzalloc_obj(*trig_info);
if (!trig_info) {
ret = -ENOMEM;
goto error_free_trigger;
diff --git a/drivers/iio/trigger/iio-trig-loop.c b/drivers/iio/trigger/iio-trig-loop.c
index 8996aaffb3f8..580a465035d1 100644
--- a/drivers/iio/trigger/iio-trig-loop.c
+++ b/drivers/iio/trigger/iio-trig-loop.c
@@ -80,7 +80,7 @@ static struct iio_sw_trigger *iio_trig_loop_probe(const char *name)
struct iio_loop_info *trig_info;
int ret;
- trig_info = kzalloc_obj(*trig_info, GFP_KERNEL);
+ trig_info = kzalloc_obj(*trig_info);
if (!trig_info)
return ERR_PTR(-ENOMEM);
diff --git a/drivers/iio/trigger/iio-trig-sysfs.c b/drivers/iio/trigger/iio-trig-sysfs.c
index f242b3209307..b242b050ba18 100644
--- a/drivers/iio/trigger/iio-trig-sysfs.c
+++ b/drivers/iio/trigger/iio-trig-sysfs.c
@@ -140,7 +140,7 @@ static int iio_sysfs_trigger_probe(int id)
ret = -EINVAL;
goto err_unlock;
}
- t = kmalloc_obj(*t, GFP_KERNEL);
+ t = kmalloc_obj(*t);
if (t == NULL) {
ret = -ENOMEM;
goto err_unlock;