| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <56466C68.4040302@welchs.me.uk>
Date: Fri, 13 Nov 2015 23:04:08 +0000
From: Martyn Welch <martyn@...chs.me.uk>
To: Egor Uleyskiy <egor.ulieiskii@...il.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>
CC: Manohar Vanga <manohar.vanga@...il.com>,
Trivial Patch Monkey <trivial@...nel.org>,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH] drivers: staging: vme: Fixed code style issues
On 13/11/15 20:01, Egor Uleyskiy wrote:
> From: Egor Uleyskiy <egor.ulieiskii@...il.com>
>
> * Fixed indention
> * Deleted extra empty lines
> * Constructions that looks like
> card = kzalloc(sizeof(struct pio2_card), GFP_KERNEL);
> are changed to
> card = kzalloc(sizeof(*card), GFP_KERNEL);
Also:
* Removing extra bracketing from uses of the address operator
* Use preferred null return check style
Other than that:
Acked-by: Martyn Welch <martyn@...chs.me.uk>
Martyn
>
> Signed-off-by: Egor Uleyskiy <egor.ulieiskii@...il.com>
> ---
> drivers/staging/vme/devices/vme_pio2_cntr.c | 2 +-
> drivers/staging/vme/devices/vme_pio2_core.c | 20 +++++++++---------
> drivers/staging/vme/devices/vme_pio2_gpio.c | 32 ++++++++++++++---------------
> drivers/staging/vme/devices/vme_user.h | 2 --
> 4 files changed, 26 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/staging/vme/devices/vme_pio2_cntr.c b/drivers/staging/vme/devices/vme_pio2_cntr.c
> index 6335471..486c30c 100644
> --- a/drivers/staging/vme/devices/vme_pio2_cntr.c
> +++ b/drivers/staging/vme/devices/vme_pio2_cntr.c
> @@ -61,7 +61,7 @@ int pio2_cntr_reset(struct pio2_card *card)
> /* Ensure all counter interrupts are cleared */
> do {
> retval = vme_master_read(card->window, ®, 1,
> - PIO2_REGS_INT_STAT_CNTR);
> + PIO2_REGS_INT_STAT_CNTR);
> if (retval < 0)
> return retval;
> } while (reg != 0);
> diff --git a/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c
> index 35c6ce5..28a6ab6 100644
> --- a/drivers/staging/vme/devices/vme_pio2_core.c
> +++ b/drivers/staging/vme/devices/vme_pio2_core.c
> @@ -90,7 +90,7 @@ static void pio2_int(int level, int vector, void *ptr)
> case 4:
> /* Channels 0 to 7 */
> retval = vme_master_read(card->window, ®, 1,
> - PIO2_REGS_INT_STAT[vec - 1]);
> + PIO2_REGS_INT_STAT[vec - 1]);
> if (retval < 0) {
> dev_err(&card->vdev->dev,
> "Unable to read IRQ status register\n");
> @@ -100,8 +100,8 @@ static void pio2_int(int level, int vector, void *ptr)
> channel = ((vec - 1) * 8) + i;
> if (reg & PIO2_CHANNEL_BIT[channel])
> dev_info(&card->vdev->dev,
> - "Interrupt on I/O channel %d\n",
> - channel);
> + "Interrupt on I/O channel %d\n",
> + channel);
> }
> break;
> case 5:
> @@ -215,7 +215,7 @@ static int pio2_probe(struct vme_dev *vdev)
> u8 reg;
> int vec;
>
> - card = kzalloc(sizeof(struct pio2_card), GFP_KERNEL);
> + card = kzalloc(sizeof(*card), GFP_KERNEL);
> if (!card) {
> retval = -ENOMEM;
> goto err_struct;
> @@ -289,7 +289,7 @@ static int pio2_probe(struct vme_dev *vdev)
> }
>
> retval = vme_master_set(card->window, 1, card->base, 0x10000, VME_A24,
> - (VME_SCT | VME_USER | VME_DATA), VME_D16);
> + (VME_SCT | VME_USER | VME_DATA), VME_D16);
> if (retval) {
> dev_err(&card->vdev->dev,
> "Unable to configure VME master resource\n");
> @@ -335,7 +335,7 @@ static int pio2_probe(struct vme_dev *vdev)
>
> /* Set VME vector */
> retval = vme_master_write(card->window, &card->irq_vector, 1,
> - PIO2_REGS_VME_VECTOR);
> + PIO2_REGS_VME_VECTOR);
> if (retval < 0)
> return retval;
>
> @@ -343,7 +343,7 @@ static int pio2_probe(struct vme_dev *vdev)
> vec = card->irq_vector | PIO2_VME_VECTOR_SPUR;
>
> retval = vme_irq_request(vdev, card->irq_level, vec,
> - &pio2_int, (void *)card);
> + &pio2_int, (void *)card);
> if (retval < 0) {
> dev_err(&card->vdev->dev,
> "Unable to attach VME interrupt vector0x%x, level 0x%x\n",
> @@ -356,7 +356,7 @@ static int pio2_probe(struct vme_dev *vdev)
> vec = card->irq_vector | PIO2_VECTOR_BANK[i];
>
> retval = vme_irq_request(vdev, card->irq_level, vec,
> - &pio2_int, (void *)card);
> + &pio2_int, (void *)card);
> if (retval < 0) {
> dev_err(&card->vdev->dev,
> "Unable to attach VME interrupt vector0x%x, level 0x%x\n",
> @@ -370,7 +370,7 @@ static int pio2_probe(struct vme_dev *vdev)
> vec = card->irq_vector | PIO2_VECTOR_CNTR[i];
>
> retval = vme_irq_request(vdev, card->irq_level, vec,
> - &pio2_int, (void *)card);
> + &pio2_int, (void *)card);
> if (retval < 0) {
> dev_err(&card->vdev->dev,
> "Unable to attach VME interrupt vector0x%x, level 0x%x\n",
> @@ -397,7 +397,7 @@ static int pio2_probe(struct vme_dev *vdev)
> dev_set_drvdata(&card->vdev->dev, card);
>
> dev_info(&card->vdev->dev,
> - "PIO2 (variant %s) configured at 0x%lx\n", card->variant,
> + "PIO2 (variant %s) configured at 0x%lx\n", card->variant,
> card->base);
>
> return 0;
> diff --git a/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c
> index 77901b3..d441ff2 100644
> --- a/drivers/staging/vme/devices/vme_pio2_gpio.c
> +++ b/drivers/staging/vme/devices/vme_pio2_gpio.c
> @@ -37,14 +37,13 @@ static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
> struct pio2_card *card = gpio_to_pio2_card(chip);
>
> if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
> - (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
> -
> + (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
> dev_err(&card->vdev->dev, "Channel not available as input\n");
> return 0;
> }
>
> retval = vme_master_read(card->window, ®, 1,
> - PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
> + PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
> if (retval < 0) {
> dev_err(&card->vdev->dev, "Unable to read from GPIO\n");
> return 0;
> @@ -67,29 +66,28 @@ static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
> return 0;
> }
>
> -static void pio2_gpio_set(struct gpio_chip *chip, unsigned int offset,
> - int value)
> +static void pio2_gpio_set(struct gpio_chip *chip,
> + unsigned int offset, int value)
> {
> u8 reg;
> int retval;
> struct pio2_card *card = gpio_to_pio2_card(chip);
>
> if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
> - (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
> -
> + (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
> dev_err(&card->vdev->dev, "Channel not available as output\n");
> return;
> }
>
> if (value)
> reg = card->bank[PIO2_CHANNEL_BANK[offset]].value |
> - PIO2_CHANNEL_BIT[offset];
> + PIO2_CHANNEL_BIT[offset];
> else
> reg = card->bank[PIO2_CHANNEL_BANK[offset]].value &
> - ~PIO2_CHANNEL_BIT[offset];
> + ~PIO2_CHANNEL_BIT[offset];
>
> retval = vme_master_write(card->window, ®, 1,
> - PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
> + PIO2_REGS_DATA[PIO2_CHANNEL_BANK[offset]]);
> if (retval < 0) {
> dev_err(&card->vdev->dev, "Unable to write to GPIO\n");
> return;
> @@ -150,7 +148,7 @@ int pio2_gpio_reset(struct pio2_card *card)
> /* Zero output registers */
> for (i = 0; i < 4; i++) {
> retval = vme_master_write(card->window, &data, 1,
> - PIO2_REGS_DATA[i]);
> + PIO2_REGS_DATA[i]);
> if (retval < 0)
> return retval;
> card->bank[i].value = 0;
> @@ -159,12 +157,12 @@ int pio2_gpio_reset(struct pio2_card *card)
> /* Set input interrupt masks */
> for (i = 0; i < 4; i++) {
> retval = vme_master_write(card->window, &data, 1,
> - PIO2_REGS_INT_MASK[i * 2]);
> + PIO2_REGS_INT_MASK[i * 2]);
> if (retval < 0)
> return retval;
>
> retval = vme_master_write(card->window, &data, 1,
> - PIO2_REGS_INT_MASK[(i * 2) + 1]);
> + PIO2_REGS_INT_MASK[(i * 2) + 1]);
> if (retval < 0)
> return retval;
>
> @@ -176,7 +174,7 @@ int pio2_gpio_reset(struct pio2_card *card)
> for (i = 0; i < 4; i++) {
> do {
> retval = vme_master_read(card->window, &data, 1,
> - PIO2_REGS_INT_STAT[i]);
> + PIO2_REGS_INT_STAT[i]);
> if (retval < 0)
> return retval;
> } while (data != 0);
> @@ -192,7 +190,7 @@ int pio2_gpio_init(struct pio2_card *card)
>
> label = kasprintf(GFP_KERNEL,
> "%s@%s", driver_name, dev_name(&card->vdev->dev));
> - if (label == NULL)
> + if (!label)
> return -ENOMEM;
>
> card->gc.label = label;
> @@ -207,7 +205,7 @@ int pio2_gpio_init(struct pio2_card *card)
> card->gc.set = pio2_gpio_set;
>
> /* This function adds a memory mapped GPIO chip */
> - retval = gpiochip_add(&(card->gc));
> + retval = gpiochip_add(&card->gc);
> if (retval) {
> dev_err(&card->vdev->dev, "Unable to register GPIO\n");
> kfree(card->gc.label);
> @@ -220,7 +218,7 @@ void pio2_gpio_exit(struct pio2_card *card)
> {
> const char *label = card->gc.label;
>
> - gpiochip_remove(&(card->gc));
> + gpiochip_remove(&card->gc);
> kfree(label);
> }
>
> diff --git a/drivers/staging/vme/devices/vme_user.h b/drivers/staging/vme/devices/vme_user.h
> index b8cc7bc..a6cb756 100644
> --- a/drivers/staging/vme/devices/vme_user.h
> +++ b/drivers/staging/vme/devices/vme_user.h
> @@ -20,7 +20,6 @@ struct vme_master {
> #endif
> } __packed;
>
> -
> /*
> * IOCTL Commands and structures
> */
> @@ -28,7 +27,6 @@ struct vme_master {
> /* Magic number for use in ioctls */
> #define VME_IOC_MAGIC 0xAE
>
> -
> /* VMEbus Slave Window Configuration Structure */
> struct vme_slave {
> __u32 enable; /* State of Window */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists