xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rpmsg: align code with open parenthesis

Browse Source 
This patch fixes most of the existing alignment checkpatch check
warnings of the type "Alignment should match open parenthesis"
in the virtio rpmsg bus code. A couple of them have been left as
is to not exceed the 80-char limit.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Anna, Suman
2016-08-12 18:42:26 -05:00
committed by Bjorn Andersson
parent 8d95b322ba
commit 0963679c0c
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/rpmsg/virtio_rpmsg_bus.c
View File

@@ -162,7 +162,7 @@ static struct device_attribute rpmsg_dev_attrs[] = {
/* rpmsg devices and drivers are matched using the service name */ /* rpmsg devices and drivers are matched using the service name */
static inline int rpmsg_id_match(const struct rpmsg_channel *rpdev, static inline int rpmsg_id_match(const struct rpmsg_channel *rpdev,
const struct rpmsg_device_id *id) const struct rpmsg_device_id *id)
{ {
return strncmp(id->name, rpdev->id.name, RPMSG_NAME_SIZE) == 0; return strncmp(id->name, rpdev->id.name, RPMSG_NAME_SIZE) == 0;
} }
@@ -212,8 +212,9 @@ static void __ept_release(struct kref *kref)
/* for more info, see below documentation of rpmsg_create_ept() */ /* for more info, see below documentation of rpmsg_create_ept() */
static struct rpmsg_endpoint *__rpmsg_create_ept(struct virtproc_info *vrp, static struct rpmsg_endpoint *__rpmsg_create_ept(struct virtproc_info *vrp,
struct rpmsg_channel *rpdev, rpmsg_rx_cb_t cb, struct rpmsg_channel *rpdev,
void *priv, u32 addr) rpmsg_rx_cb_t cb,
void *priv, u32 addr)
{ {
int id_min, id_max, id; int id_min, id_max, id;
struct rpmsg_endpoint *ept; struct rpmsg_endpoint *ept;
@@ -300,7 +301,7 @@ free_ept:
* Returns a pointer to the endpoint on success, or NULL on error. * Returns a pointer to the endpoint on success, or NULL on error.
*/ */
struct rpmsg_endpoint *rpmsg_create_ept(struct rpmsg_channel *rpdev, struct rpmsg_endpoint *rpmsg_create_ept(struct rpmsg_channel *rpdev,
rpmsg_rx_cb_t cb, void *priv, u32 addr) rpmsg_rx_cb_t cb, void *priv, u32 addr)
{ {
return __rpmsg_create_ept(rpdev->vrp, rpdev, cb, priv, addr); return __rpmsg_create_ept(rpdev->vrp, rpdev, cb, priv, addr);
} }
@@ -380,7 +381,7 @@ static int rpmsg_dev_probe(struct device *dev)
/* need to tell remote processor's name service about this channel ? */ /* need to tell remote processor's name service about this channel ? */
if (rpdev->announce && if (rpdev->announce &&
virtio_has_feature(vrp->vdev, VIRTIO_RPMSG_F_NS)) { virtio_has_feature(vrp->vdev, VIRTIO_RPMSG_F_NS)) {
struct rpmsg_ns_msg nsm; struct rpmsg_ns_msg nsm;
strncpy(nsm.name, rpdev->id.name, RPMSG_NAME_SIZE); strncpy(nsm.name, rpdev->id.name, RPMSG_NAME_SIZE);
@@ -405,7 +406,7 @@ static int rpmsg_dev_remove(struct device *dev)
/* tell remote processor's name service we're removing this channel */ /* tell remote processor's name service we're removing this channel */
if (rpdev->announce && if (rpdev->announce &&
virtio_has_feature(vrp->vdev, VIRTIO_RPMSG_F_NS)) { virtio_has_feature(vrp->vdev, VIRTIO_RPMSG_F_NS)) {
struct rpmsg_ns_msg nsm; struct rpmsg_ns_msg nsm;
strncpy(nsm.name, rpdev->id.name, RPMSG_NAME_SIZE); strncpy(nsm.name, rpdev->id.name, RPMSG_NAME_SIZE);
@@ -550,7 +551,7 @@ static struct rpmsg_channel *rpmsg_create_channel(struct virtproc_info *vrp,
* and destroy it * and destroy it
*/ */
static int rpmsg_destroy_channel(struct virtproc_info *vrp, static int rpmsg_destroy_channel(struct virtproc_info *vrp,
struct rpmsg_channel_info *chinfo) struct rpmsg_channel_info *chinfo)
{ {
struct virtio_device *vdev = vrp->vdev; struct virtio_device *vdev = vrp->vdev;
struct device *dev; struct device *dev;
@@ -681,7 +682,7 @@ static void rpmsg_downref_sleepers(struct virtproc_info *vrp)
* Returns 0 on success and an appropriate error value on failure. * Returns 0 on success and an appropriate error value on failure.
*/ */
int rpmsg_send_offchannel_raw(struct rpmsg_channel *rpdev, u32 src, u32 dst, int rpmsg_send_offchannel_raw(struct rpmsg_channel *rpdev, u32 src, u32 dst,
void *data, int len, bool wait) void *data, int len, bool wait)
{ {
struct virtproc_info *vrp = rpdev->vrp; struct virtproc_info *vrp = rpdev->vrp;
struct device *dev = &rpdev->dev; struct device *dev = &rpdev->dev;
@@ -747,10 +748,9 @@ int rpmsg_send_offchannel_raw(struct rpmsg_channel *rpdev, u32 src, u32 dst,
memcpy(msg->data, data, len); memcpy(msg->data, data, len);
dev_dbg(dev, "TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n", dev_dbg(dev, "TX From 0x%x, To 0x%x, Len %d, Flags %d, Reserved %d\n",
msg->src, msg->dst, msg->len, msg->src, msg->dst, msg->len, msg->flags, msg->reserved);
msg->flags, msg->reserved);
print_hex_dump(KERN_DEBUG, "rpmsg_virtio TX: ", DUMP_PREFIX_NONE, 16, 1, print_hex_dump(KERN_DEBUG, "rpmsg_virtio TX: ", DUMP_PREFIX_NONE, 16, 1,
msg, sizeof(*msg) + msg->len, true); msg, sizeof(*msg) + msg->len, true);
sg_init_one(&sg, msg, sizeof(*msg) + len); sg_init_one(&sg, msg, sizeof(*msg) + len);
@@ -784,17 +784,16 @@ static int rpmsg_recv_single(struct virtproc_info *vrp, struct device *dev,
int err; int err;
dev_dbg(dev, "From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n", dev_dbg(dev, "From: 0x%x, To: 0x%x, Len: %d, Flags: %d, Reserved: %d\n",
msg->src, msg->dst, msg->len, msg->src, msg->dst, msg->len, msg->flags, msg->reserved);
msg->flags, msg->reserved);
print_hex_dump(KERN_DEBUG, "rpmsg_virtio RX: ", DUMP_PREFIX_NONE, 16, 1, print_hex_dump(KERN_DEBUG, "rpmsg_virtio RX: ", DUMP_PREFIX_NONE, 16, 1,
msg, sizeof(*msg) + msg->len, true); msg, sizeof(*msg) + msg->len, true);
/* /*
* We currently use fixed-sized buffers, so trivially sanitize * We currently use fixed-sized buffers, so trivially sanitize
* the reported payload length. * the reported payload length.
*/ */
if (len > RPMSG_BUF_SIZE || if (len > RPMSG_BUF_SIZE ||
msg->len > (len - sizeof(struct rpmsg_hdr))) { msg->len > (len - sizeof(struct rpmsg_hdr))) {
dev_warn(dev, "inbound msg too big: (%d, %d)\n", len, msg->len); dev_warn(dev, "inbound msg too big: (%d, %d)\n", len, msg->len);
return -EINVAL; return -EINVAL;
} }
@@ -889,7 +888,7 @@ static void rpmsg_xmit_done(struct virtqueue *svq)
/* invoked when a name service announcement arrives */ /* invoked when a name service announcement arrives */
static void rpmsg_ns_cb(struct rpmsg_channel *rpdev, void *data, int len, static void rpmsg_ns_cb(struct rpmsg_channel *rpdev, void *data, int len,
void *priv, u32 src) void *priv, u32 src)
{ {
struct rpmsg_ns_msg *msg = data; struct rpmsg_ns_msg *msg = data;
struct rpmsg_channel *newch; struct rpmsg_channel *newch;
@@ -899,8 +898,7 @@ static void rpmsg_ns_cb(struct rpmsg_channel *rpdev, void *data, int len,
int ret; int ret;
print_hex_dump(KERN_DEBUG, "NS announcement: ", print_hex_dump(KERN_DEBUG, "NS announcement: ",
DUMP_PREFIX_NONE, 16, 1, DUMP_PREFIX_NONE, 16, 1, data, len, true);
data, len, true);
if (len != sizeof(*msg)) { if (len != sizeof(*msg)) {
dev_err(dev, "malformed ns msg (%d)\n", len); dev_err(dev, "malformed ns msg (%d)\n", len);
@@ -922,8 +920,8 @@ static void rpmsg_ns_cb(struct rpmsg_channel *rpdev, void *data, int len,
msg->name[RPMSG_NAME_SIZE - 1] = '\0'; msg->name[RPMSG_NAME_SIZE - 1] = '\0';
dev_info(dev, "%sing channel %s addr 0x%x\n", dev_info(dev, "%sing channel %s addr 0x%x\n",
msg->flags & RPMSG_NS_DESTROY ? "destroy" : "creat", msg->flags & RPMSG_NS_DESTROY ? "destroy" : "creat",
msg->name, msg->addr); msg->name, msg->addr);
strncpy(chinfo.name, msg->name, sizeof(chinfo.name)); strncpy(chinfo.name, msg->name, sizeof(chinfo.name));
chinfo.src = RPMSG_ADDR_ANY; chinfo.src = RPMSG_ADDR_ANY;
@@ -1008,7 +1006,7 @@ static int rpmsg_probe(struct virtio_device *vdev)
sg_init_one(&sg, cpu_addr, RPMSG_BUF_SIZE); sg_init_one(&sg, cpu_addr, RPMSG_BUF_SIZE);
err = virtqueue_add_inbuf(vrp->rvq, &sg, 1, cpu_addr, err = virtqueue_add_inbuf(vrp->rvq, &sg, 1, cpu_addr,
GFP_KERNEL); GFP_KERNEL);
WARN_ON(err); /* sanity check; this can't really happen */ WARN_ON(err); /* sanity check; this can't really happen */
} }

6
include/linux/rpmsg.h
View File

@@ -173,7 +173,7 @@ int __register_rpmsg_driver(struct rpmsg_driver *drv, struct module *owner);
void unregister_rpmsg_driver(struct rpmsg_driver *drv); void unregister_rpmsg_driver(struct rpmsg_driver *drv);
void rpmsg_destroy_ept(struct rpmsg_endpoint *); void rpmsg_destroy_ept(struct rpmsg_endpoint *);
struct rpmsg_endpoint *rpmsg_create_ept(struct rpmsg_channel *, struct rpmsg_endpoint *rpmsg_create_ept(struct rpmsg_channel *,
rpmsg_rx_cb_t cb, void *priv, u32 addr); rpmsg_rx_cb_t cb, void *priv, u32 addr);
int int
rpmsg_send_offchannel_raw(struct rpmsg_channel *, u32, u32, void *, int, bool); rpmsg_send_offchannel_raw(struct rpmsg_channel *, u32, u32, void *, int, bool);
@@ -265,7 +265,7 @@ int rpmsg_sendto(struct rpmsg_channel *rpdev, void *data, int len, u32 dst)
*/ */
static inline static inline
int rpmsg_send_offchannel(struct rpmsg_channel *rpdev, u32 src, u32 dst, int rpmsg_send_offchannel(struct rpmsg_channel *rpdev, u32 src, u32 dst,
void *data, int len) void *data, int len)
{ {
return rpmsg_send_offchannel_raw(rpdev, src, dst, data, len, true); return rpmsg_send_offchannel_raw(rpdev, src, dst, data, len, true);
} }
@@ -340,7 +340,7 @@ int rpmsg_trysendto(struct rpmsg_channel *rpdev, void *data, int len, u32 dst)
*/ */
static inline static inline
int rpmsg_trysend_offchannel(struct rpmsg_channel *rpdev, u32 src, u32 dst, int rpmsg_trysend_offchannel(struct rpmsg_channel *rpdev, u32 src, u32 dst,
void *data, int len) void *data, int len)
{ {
return rpmsg_send_offchannel_raw(rpdev, src, dst, data, len, false); return rpmsg_send_offchannel_raw(rpdev, src, dst, data, len, false);
} }