mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-23 17:30:02 +00:00
Code Issues Releases Wiki Activity

staging: most: core: rename struct memeber

Browse source 
This patch renames the member "ptr" of struct pipe to "aim". This is needed
to increase the readability of the code.

Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christian Gromm 2017-11-21 15:04:49 +01:00 committed by Greg Kroah-Hartman
parent 7faeffec7f
commit ab868bad3c
1 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
drivers/staging/most/core.c
View file

@ -32,7 +32,7 @@ static struct ida mdev_id;
static int dummy_num_buffers;
struct pipe {
struct most_aim *ptr;
struct most_aim *aim;
int refs;
int num_buffers;
};
@ -536,7 +536,7 @@ static ssize_t links_show(struct device *dev, struct device_attribute *attr,
list_for_each_entry(i, &instance_list, list) {
list_for_each_entry(c, &i->channel_list, list) {
if (c->aim0.ptr == aim || c->aim1.ptr == aim) {
if (c->aim0.aim == aim || c->aim1.aim == aim) {
offs += snprintf(buf + offs, PAGE_SIZE - offs,
"%s:%s\n",
dev_name(&i->iface->dev),
@ -626,10 +626,10 @@ inline int link_channel_to_aim(struct most_channel *c, struct most_aim *aim,
int ret;
struct most_aim **aim_ptr;
if (!c->aim0.ptr)
aim_ptr = &c->aim0.ptr;
else if (!c->aim1.ptr)
aim_ptr = &c->aim1.ptr;
if (!c->aim0.aim)
aim_ptr = &c->aim0.aim;
else if (!c->aim1.aim)
aim_ptr = &c->aim1.aim;
else
return -ENOSPC;
@ -738,10 +738,10 @@ static ssize_t remove_link_store(struct device *dev,
if (aim->disconnect_channel(c->iface, c->channel_id))
return -EIO;
if (c->aim0.ptr == aim)
c->aim0.ptr = NULL;
if (c->aim1.ptr == aim)
c->aim1.ptr = NULL;
if (c->aim0.aim == aim)
c->aim0.aim = NULL;
if (c->aim1.aim == aim)
c->aim1.aim = NULL;
return len;
}
@ -910,11 +910,11 @@ static void arm_mbo(struct mbo *mbo)
list_add_tail(&mbo->list, &c->fifo);
spin_unlock_irqrestore(&c->fifo_lock, flags);
if (c->aim0.refs && c->aim0.ptr->tx_completion)
c->aim0.ptr->tx_completion(c->iface, c->channel_id);
if (c->aim0.refs && c->aim0.aim->tx_completion)
c->aim0.aim->tx_completion(c->iface, c->channel_id);
if (c->aim1.refs && c->aim1.ptr->tx_completion)
c->aim1.ptr->tx_completion(c->iface, c->channel_id);
if (c->aim1.refs && c->aim1.aim->tx_completion)
c->aim1.aim->tx_completion(c->iface, c->channel_id);
}
/**
@ -1022,8 +1022,8 @@ int channel_has_mbo(struct most_interface *iface, int id, struct most_aim *aim)
return -EINVAL;
if (c->aim0.refs && c->aim1.refs &&
((aim == c->aim0.ptr && c->aim0.num_buffers <= 0) ||
(aim == c->aim1.ptr && c->aim1.num_buffers <= 0)))
((aim == c->aim0.aim && c->aim0.num_buffers <= 0) ||
(aim == c->aim1.aim && c->aim1.num_buffers <= 0)))
return 0;
spin_lock_irqsave(&c->fifo_lock, flags);
@ -1055,13 +1055,13 @@ struct mbo *most_get_mbo(struct most_interface *iface, int id,
return NULL;
if (c->aim0.refs && c->aim1.refs &&
((aim == c->aim0.ptr && c->aim0.num_buffers <= 0) ||
(aim == c->aim1.ptr && c->aim1.num_buffers <= 0)))
((aim == c->aim0.aim && c->aim0.num_buffers <= 0) ||
(aim == c->aim1.aim && c->aim1.num_buffers <= 0)))
return NULL;
if (aim == c->aim0.ptr)
if (aim == c->aim0.aim)
num_buffers_ptr = &c->aim0.num_buffers;
else if (aim == c->aim1.ptr)
else if (aim == c->aim1.aim)
num_buffers_ptr = &c->aim1.num_buffers;
else
num_buffers_ptr = &dummy_num_buffers;
@ -1126,12 +1126,12 @@ static void most_read_completion(struct mbo *mbo)
if (atomic_sub_and_test(1, &c->mbo_nq_level))
c->is_starving = 1;
if (c->aim0.refs && c->aim0.ptr->rx_completion &&
c->aim0.ptr->rx_completion(mbo) == 0)
if (c->aim0.refs && c->aim0.aim->rx_completion &&
c->aim0.aim->rx_completion(mbo) == 0)
return;
if (c->aim1.refs && c->aim1.ptr->rx_completion &&
c->aim1.ptr->rx_completion(mbo) == 0)
if (c->aim1.refs && c->aim1.aim->rx_completion &&
c->aim1.aim->rx_completion(mbo) == 0)
return;
most_put_mbo(mbo);
@ -1199,9 +1199,9 @@ int most_start_channel(struct most_interface *iface, int id,
atomic_set(&c->mbo_ref, num_buffer);
out:
if (aim == c->aim0.ptr)
if (aim == c->aim0.aim)
c->aim0.refs++;
if (aim == c->aim1.ptr)
if (aim == c->aim1.aim)
c->aim1.refs++;
mutex_unlock(&c->start_mutex);
return 0;
@ -1266,9 +1266,9 @@ int most_stop_channel(struct most_interface *iface, int id,
c->is_poisoned = false;
out:
if (aim == c->aim0.ptr)
if (aim == c->aim0.aim)
c->aim0.refs--;
if (aim == c->aim1.ptr)
if (aim == c->aim1.aim)
c->aim1.refs--;
mutex_unlock(&c->start_mutex);
return 0;
@ -1324,13 +1324,13 @@ int most_deregister_aim(struct most_aim *aim)
list_for_each_entry_safe(i, i_tmp, &instance_list, list) {
list_for_each_entry_safe(c, tmp, &i->channel_list, list) {
if (c->aim0.ptr == aim || c->aim1.ptr == aim)
if (c->aim0.aim == aim || c->aim1.aim == aim)
aim->disconnect_channel(
c->iface, c->channel_id);
if (c->aim0.ptr == aim)
c->aim0.ptr = NULL;
if (c->aim1.ptr == aim)
c->aim1.ptr = NULL;
if (c->aim0.aim == aim)
c->aim0.aim = NULL;
if (c->aim1.aim == aim)
c->aim1.aim = NULL;
}
}
device_unregister(&aim->dev);
@ -1475,14 +1475,14 @@ void most_deregister_interface(struct most_interface *iface)
inst = iface->priv;
for (i = 0; i < iface->num_channels; i++) {
c = inst->channel[i];
if (c->aim0.ptr)
c->aim0.ptr->disconnect_channel(c->iface,
if (c->aim0.aim)
c->aim0.aim->disconnect_channel(c->iface,
c->channel_id);
if (c->aim1.ptr)
c->aim1.ptr->disconnect_channel(c->iface,
if (c->aim1.aim)
c->aim1.aim->disconnect_channel(c->iface,
c->channel_id);
c->aim0.ptr = NULL;
c->aim1.ptr = NULL;
c->aim0.aim = NULL;
c->aim1.aim = NULL;
list_del(&c->list);
device_unregister(&c->dev);
kfree(c);