From: Guangbin Huang <huangguangbin2@huawei.com>
To: <davem@davemloft.net>, <kuba@kernel.org>, <xie.he.0141@gmail.com>,
<ms@dev.tdt.de>, <willemb@google.com>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<lipeng321@huawei.com>, <huangguangbin2@huawei.com>
Subject: [PATCH net-next 11/15] net: cosa: fix the alignment issue
Date: Wed, 16 Jun 2021 15:23:37 +0800 [thread overview]
Message-ID: <1623828221-48349-12-git-send-email-huangguangbin2@huawei.com> (raw)
In-Reply-To: <1623828221-48349-1-git-send-email-huangguangbin2@huawei.com>
From: Peng Li <lipeng321@huawei.com>
Alignment should match open parenthesis.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/cosa.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index ade6da7..fbfc3e5 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -274,14 +274,14 @@ static char *chrdev_setup_rx(struct channel_data *channel, int size);
static int chrdev_rx_done(struct channel_data *channel);
static int chrdev_tx_done(struct channel_data *channel, int size);
static ssize_t cosa_read(struct file *file,
- char __user *buf, size_t count, loff_t *ppos);
+ char __user *buf, size_t count, loff_t *ppos);
static ssize_t cosa_write(struct file *file,
- const char __user *buf, size_t count, loff_t *ppos);
+ const char __user *buf, size_t count, loff_t *ppos);
static unsigned int cosa_poll(struct file *file, poll_table *poll);
static int cosa_open(struct inode *inode, struct file *file);
static int cosa_release(struct inode *inode, struct file *file);
static long cosa_chardev_ioctl(struct file *file, unsigned int cmd,
- unsigned long arg);
+ unsigned long arg);
#ifdef COSA_FASYNC_WORKING
static int cosa_fasync(struct inode *inode, struct file *file, int on);
#endif
@@ -655,7 +655,7 @@ static int cosa_net_open(struct net_device *dev)
}
static netdev_tx_t cosa_net_tx(struct sk_buff *skb,
- struct net_device *dev)
+ struct net_device *dev)
{
struct channel_data *chan = dev_to_chan(dev);
@@ -762,7 +762,7 @@ static int cosa_net_tx_done(struct channel_data *chan, int size)
/*---------- Character device ---------- */
static ssize_t cosa_read(struct file *file,
- char __user *buf, size_t count, loff_t *ppos)
+ char __user *buf, size_t count, loff_t *ppos)
{
DECLARE_WAITQUEUE(wait, current);
unsigned long flags;
@@ -836,7 +836,7 @@ static int chrdev_rx_done(struct channel_data *chan)
}
static ssize_t cosa_write(struct file *file,
- const char __user *buf, size_t count, loff_t *ppos)
+ const char __user *buf, size_t count, loff_t *ppos)
{
DECLARE_WAITQUEUE(wait, current);
struct channel_data *chan = file->private_data;
@@ -1123,7 +1123,8 @@ static inline int cosa_gettype(struct cosa_data *cosa, char __user *string)
}
static int cosa_ioctl_common(struct cosa_data *cosa,
- struct channel_data *channel, unsigned int cmd, unsigned long arg)
+ struct channel_data *channel, unsigned int cmd,
+ unsigned long arg)
{
void __user *argp = (void __user *)arg;
@@ -1181,7 +1182,7 @@ static int cosa_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
}
static long cosa_chardev_ioctl(struct file *file, unsigned int cmd,
- unsigned long arg)
+ unsigned long arg)
{
struct channel_data *channel = file->private_data;
struct cosa_data *cosa;
@@ -1684,11 +1685,12 @@ static inline void tx_interrupt(struct cosa_data *cosa, int status)
cosa->txsize = cosa->chan[cosa->txchan].txsize;
if (cosa_dma_able(cosa->chan+cosa->txchan,
- cosa->chan[cosa->txchan].txbuf, cosa->txsize)) {
+ cosa->chan[cosa->txchan].txbuf,
+ cosa->txsize)) {
cosa->txbuf = cosa->chan[cosa->txchan].txbuf;
} else {
memcpy(cosa->bouncebuf, cosa->chan[cosa->txchan].txbuf,
- cosa->txsize);
+ cosa->txsize);
cosa->txbuf = cosa->bouncebuf;
}
}
--
2.8.1
next prev parent reply other threads:[~2021-06-16 7:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 7:23 [PATCH net-next 00/15] net: cosa: clean up some code style issues Guangbin Huang
2021-06-16 7:23 ` [PATCH net-next 01/15] net: cosa: remove redundant blank lines Guangbin Huang
2021-06-16 7:23 ` [PATCH net-next 02/15] net: cosa: add blank line after declarations Guangbin Huang
2021-06-16 7:23 ` [PATCH net-next 03/15] net: cosa: fix the code style issue about "foo* bar" Guangbin Huang
2021-06-16 7:23 ` [PATCH net-next 04/15] net: cosa: replace comparison to NULL with "!chan->rx_skb" Guangbin Huang
2021-06-16 7:23 ` [PATCH net-next 05/15] net: cosa: move out assignment in if condition Guangbin Huang
2021-06-16 7:23 ` [PATCH net-next 06/15] net: cosa: fix the comments style issue Guangbin Huang
2021-06-16 7:23 ` [PATCH net-next 07/15] net: cosa: add braces {} to all arms of the statement Guangbin Huang
2021-06-16 7:23 ` [PATCH net-next 08/15] net: cosa: remove redundant braces {} Guangbin Huang
2021-06-16 7:23 ` [PATCH net-next 09/15] net: cosa: add necessary () to macro argument Guangbin Huang
2021-06-16 7:23 ` [PATCH net-next 10/15] net: cosa: use BIT macro Guangbin Huang
2021-06-16 7:23 ` Guangbin Huang [this message]
2021-06-16 7:23 ` [PATCH net-next 12/15] net: cosa: fix the code style issue about trailing statements Guangbin Huang
2021-06-16 7:23 ` [PATCH net-next 13/15] net: cosa: add some required spaces Guangbin Huang
2021-06-16 7:23 ` [PATCH net-next 14/15] net: cosa: remove trailing whitespaces Guangbin Huang
2021-06-16 7:23 ` [PATCH net-next 15/15] net: cosa: remove redundant spaces Guangbin Huang
2021-06-16 8:00 ` [PATCH net-next 00/15] net: cosa: clean up some code style issues patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1623828221-48349-12-git-send-email-huangguangbin2@huawei.com \
--to=huangguangbin2@huawei.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lipeng321@huawei.com \
--cc=ms@dev.tdt.de \
--cc=netdev@vger.kernel.org \
--cc=willemb@google.com \
--cc=xie.he.0141@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®