* [PATCH 1/1] Drivers: Staging: ft1000: checkpatch warning fixes
@ 2015-03-11 21:03 Janakarajan Natarajan
2015-03-11 21:20 ` Giedrius Statkevičius
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Janakarajan Natarajan @ 2015-03-11 21:03 UTC (permalink / raw)
To: Greg Kroah-Hartman, Joe Perches, devel
Cc: Marek Belisko, linux-kernel, Janakarajan Natarajan
Addition of blank line after declaration in ft1000_hw.c
Minor changes to remove {} from single line if and remove extra parenthesis.
Fixes checkpatch warning for <asm/bitops.h> and <asm/io.h> usage.
Signed-off-by: Janakarajan Natarajan <janakarajann@gmail.com>
---
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 12 ++++++------
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 9 +++------
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index 017c3b9..a01b9e3 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -28,8 +28,8 @@
#include <linux/timer.h>
#include <linux/interrupt.h>
#include <linux/in.h>
-#include <asm/io.h>
-#include <asm/bitops.h>
+#include <linux/io.h>
+#include <linux/bitops.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
@@ -1948,11 +1948,11 @@ static irqreturn_t ft1000_interrupt(int irq, void *dev_id)
ft1000_read_reg(dev,
FT1000_REG_MAG_DFSR);
}
- if (tempword & 0x1f) {
+ if (tempword & 0x1f)
ft1000_copy_up_pkt(dev);
- } else {
+ else
break;
- }
+
cnt++;
} while (cnt < MAX_RCV_LOOP);
@@ -2008,8 +2008,8 @@ static void ft1000_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
{
struct ft1000_info *ft_info;
- ft_info = netdev_priv(dev);
+ ft_info = netdev_priv(dev);
strlcpy(info->driver, "ft1000", sizeof(info->driver));
snprintf(info->bus_info, sizeof(info->bus_info), "PCMCIA 0x%lx",
dev->base_addr);
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
index c8d2782..bd0d25c 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
@@ -317,9 +317,8 @@ static int ft1000_open(struct inode *inode, struct file *file)
/* Search for available application info block */
for (i = 0; i < MAX_NUM_APP; i++) {
- if ((dev->app_info[i].fileobject == NULL)) {
+ if (dev->app_info[i].fileobject == NULL)
break;
- }
}
/* Fail due to lack of application info block */
@@ -575,9 +574,8 @@ static long ft1000_ioctl(struct file *file, unsigned int command,
} else {
/* Check if this message came from a registered application */
for (i = 0; i < MAX_NUM_APP; i++) {
- if (ft1000dev->app_info[i].fileobject == &file->f_owner) {
+ if (ft1000dev->app_info[i].fileobject == &file->f_owner)
break;
- }
}
if (i == MAX_NUM_APP) {
pr_debug("No matching application fileobject\n");
@@ -629,9 +627,8 @@ static long ft1000_ioctl(struct file *file, unsigned int command,
pmsg = (u16 *)&dpram_data->pseudohdr;
ppseudo_hdr = (struct pseudo_hdr *)pmsg;
total_len = msgsz+2;
- if (total_len & 0x1) {
+ if (total_len & 0x1)
total_len++;
- }
/* Insert slow queue sequence number */
ppseudo_hdr->seq_num = info->squeseqnum++;
--
1.9.1
---
This email has been checked for viruses by Avast antivirus software.
http://www.avast.com
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] Drivers: Staging: ft1000: checkpatch warning fixes
2015-03-11 21:03 [PATCH 1/1] Drivers: Staging: ft1000: checkpatch warning fixes Janakarajan Natarajan
@ 2015-03-11 21:20 ` Giedrius Statkevičius
2015-03-11 21:21 ` Joe Perches
2015-03-13 2:42 ` [PATCHv2 0/5] ft1000 driver checkpatch.pl fixes Janakarajan Natarajan
2 siblings, 0 replies; 10+ messages in thread
From: Giedrius Statkevičius @ 2015-03-11 21:20 UTC (permalink / raw)
To: Janakarajan Natarajan, Greg Kroah-Hartman, Joe Perches, devel
Cc: linux-kernel
On 2015.03.11 23:03, Janakarajan Natarajan wrote:
> Addition of blank line after declaration in ft1000_hw.c
> Minor changes to remove {} from single line if and remove extra parenthesis.
> Fixes checkpatch warning for <asm/bitops.h> and <asm/io.h> usage.
>
Greg may complain that you've done too much in 1 patch.
> Signed-off-by: Janakarajan Natarajan <janakarajann@gmail.com>
> ---
> drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 12 ++++++------
> drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 9 +++------
> 2 files changed, 9 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
> index 017c3b9..a01b9e3 100644
> --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
> +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
> @@ -28,8 +28,8 @@
> #include <linux/timer.h>
> #include <linux/interrupt.h>
> #include <linux/in.h>
> -#include <asm/io.h>
> -#include <asm/bitops.h>
> +#include <linux/io.h>
> +#include <linux/bitops.h>
>
> #include <linux/netdevice.h>
> #include <linux/etherdevice.h>
> @@ -1948,11 +1948,11 @@ static irqreturn_t ft1000_interrupt(int irq, void *dev_id)
> ft1000_read_reg(dev,
> FT1000_REG_MAG_DFSR);
> }
> - if (tempword & 0x1f) {
> + if (tempword & 0x1f)
> ft1000_copy_up_pkt(dev);
> - } else {
> + else
> break;
> - }
> +
> cnt++;
> } while (cnt < MAX_RCV_LOOP);
>
> @@ -2008,8 +2008,8 @@ static void ft1000_get_drvinfo(struct net_device *dev,
> struct ethtool_drvinfo *info)
> {
> struct ft1000_info *ft_info;
> - ft_info = netdev_priv(dev);
>
> + ft_info = netdev_priv(dev);
You could just do:
struct ft1000_info *ft_info = netdev_priv(dev)
> strlcpy(info->driver, "ft1000", sizeof(info->driver));
> snprintf(info->bus_info, sizeof(info->bus_info), "PCMCIA 0x%lx",
> dev->base_addr);
> diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
> index c8d2782..bd0d25c 100644
> --- a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
> +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
> @@ -317,9 +317,8 @@ static int ft1000_open(struct inode *inode, struct file *file)
>
> /* Search for available application info block */
> for (i = 0; i < MAX_NUM_APP; i++) {
> - if ((dev->app_info[i].fileobject == NULL)) {
> + if (dev->app_info[i].fileobject == NULL)
> break;
> - }
Here you can simply do:
if (!dev->app_info[i].file_object)
> }
>
> /* Fail due to lack of application info block */
> @@ -575,9 +574,8 @@ static long ft1000_ioctl(struct file *file, unsigned int command,
> } else {
> /* Check if this message came from a registered application */
> for (i = 0; i < MAX_NUM_APP; i++) {
> - if (ft1000dev->app_info[i].fileobject == &file->f_owner) {
> + if (ft1000dev->app_info[i].fileobject == &file->f_owner)
> break;
> - }
> }
> if (i == MAX_NUM_APP) {
> pr_debug("No matching application fileobject\n");
> @@ -629,9 +627,8 @@ static long ft1000_ioctl(struct file *file, unsigned int command,
> pmsg = (u16 *)&dpram_data->pseudohdr;
> ppseudo_hdr = (struct pseudo_hdr *)pmsg;
> total_len = msgsz+2;
> - if (total_len & 0x1) {
> + if (total_len & 0x1)
> total_len++;
> - }
>
> /* Insert slow queue sequence number */
> ppseudo_hdr->seq_num = info->squeseqnum++;
>
--
Thanks,
Giedrius
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] Drivers: Staging: ft1000: checkpatch warning fixes
2015-03-11 21:03 [PATCH 1/1] Drivers: Staging: ft1000: checkpatch warning fixes Janakarajan Natarajan
2015-03-11 21:20 ` Giedrius Statkevičius
@ 2015-03-11 21:21 ` Joe Perches
2015-03-13 2:42 ` [PATCHv2 0/5] ft1000 driver checkpatch.pl fixes Janakarajan Natarajan
2 siblings, 0 replies; 10+ messages in thread
From: Joe Perches @ 2015-03-11 21:21 UTC (permalink / raw)
To: Janakarajan Natarajan
Cc: Greg Kroah-Hartman, devel, Marek Belisko, linux-kernel
On Wed, 2015-03-11 at 14:03 -0700, Janakarajan Natarajan wrote:
> Addition of blank line after declaration in ft1000_hw.c
> Minor changes to remove {} from single line if and remove extra parenthesis.
> Fixes checkpatch warning for <asm/bitops.h> and <asm/io.h> usage.
Most prefer separate patches for each type of change,
so this single patch could be 3 patches.
> diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
and for more trivia:
> @@ -1948,11 +1948,11 @@ static irqreturn_t ft1000_interrupt(int irq, void *dev_id)
> ft1000_read_reg(dev,
> FT1000_REG_MAG_DFSR);
> }
> - if (tempword & 0x1f) {
> + if (tempword & 0x1f)
> ft1000_copy_up_pkt(dev);
> - } else {
> + else
> break;
> - }
> +
> cnt++;
> } while (cnt < MAX_RCV_LOOP);
do {
if (foo)
bar;
else
break;
} while (baz);
is generally better written
do {
if (!foo)
break;
bar;
} while (baz);
so
if (!(tempword & 0x1f))
break;
ft100_copy_up_pkt(dev);
cnt++;
} while (cnt < MAX_RCV_LOOP);
or maybe
if (!(tempword & 0x1f))
break;
ft100_copy_up_pkt(dev);
} while (++cnt < MAX_RCV_LOOP);
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCHv2 0/5] ft1000 driver checkpatch.pl fixes
2015-03-11 21:03 [PATCH 1/1] Drivers: Staging: ft1000: checkpatch warning fixes Janakarajan Natarajan
2015-03-11 21:20 ` Giedrius Statkevičius
2015-03-11 21:21 ` Joe Perches
@ 2015-03-13 2:42 ` Janakarajan Natarajan
2015-03-13 2:42 ` [PATCHv2 1/5] Drivers: Staging: ft1000: Single line if-statement changes Janakarajan Natarajan
` (4 more replies)
2 siblings, 5 replies; 10+ messages in thread
From: Janakarajan Natarajan @ 2015-03-13 2:42 UTC (permalink / raw)
To: Greg Kroah-Hartman, Joe Perches, devel
Cc: Marek Belisko, linux-kernel, Janakarajan Natarajan
Minor changes to fix ft1000 driver checkpatch.pl warnings
Janakarajan Natarajan (5):
Drivers: Staging: ft1000: Single line if-statement changes
Drivers: Staging: ft1000: Fix extra parenthesis warnings
Drivers: Staging: ft1000: Refactoring if-else statement
Drivers: Staging: ft1000: Fix blank line after declartion warning
Drivers: Staging: ft1000: checkpatch.pl header file warning fix
v2: if-else refactored as suggested by Joe Perches <joe@perches.co
Variable reworked as suggested by Giedrius Statkevicius <giedrius.statkevicius@gmail.com>
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 16 +++++++---------
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 6 ++----
2 files changed, 9 insertions(+), 13 deletions(-)
--
1.9.1
---
This email has been checked for viruses by Avast antivirus software.
http://www.avast.com
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCHv2 1/5] Drivers: Staging: ft1000: Single line if-statement changes
2015-03-13 2:42 ` [PATCHv2 0/5] ft1000 driver checkpatch.pl fixes Janakarajan Natarajan
@ 2015-03-13 2:42 ` Janakarajan Natarajan
2015-03-13 2:42 ` [PATCHv2 2/5] Drivers: Staging: ft1000: Fix extra parenthesis warnings Janakarajan Natarajan
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Janakarajan Natarajan @ 2015-03-13 2:42 UTC (permalink / raw)
To: Greg Kroah-Hartman, Joe Perches, devel
Cc: Marek Belisko, linux-kernel, Janakarajan Natarajan
Minor change to remove {} for single line if statements
Signed-off-by: Janakarajan Natarajan <janakarajann@gmail.com>
---
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
index c8d2782..8fb0f5a 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
@@ -317,9 +317,8 @@ static int ft1000_open(struct inode *inode, struct file *file)
/* Search for available application info block */
for (i = 0; i < MAX_NUM_APP; i++) {
- if ((dev->app_info[i].fileobject == NULL)) {
+ if ((dev->app_info[i].fileobject == NULL))
break;
- }
}
/* Fail due to lack of application info block */
@@ -575,9 +574,8 @@ static long ft1000_ioctl(struct file *file, unsigned int command,
} else {
/* Check if this message came from a registered application */
for (i = 0; i < MAX_NUM_APP; i++) {
- if (ft1000dev->app_info[i].fileobject == &file->f_owner) {
+ if (ft1000dev->app_info[i].fileobject == &file->f_owner)
break;
- }
}
if (i == MAX_NUM_APP) {
pr_debug("No matching application fileobject\n");
--
1.9.1
---
This email has been checked for viruses by Avast antivirus software.
http://www.avast.com
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCHv2 2/5] Drivers: Staging: ft1000: Fix extra parenthesis warnings
2015-03-13 2:42 ` [PATCHv2 0/5] ft1000 driver checkpatch.pl fixes Janakarajan Natarajan
2015-03-13 2:42 ` [PATCHv2 1/5] Drivers: Staging: ft1000: Single line if-statement changes Janakarajan Natarajan
@ 2015-03-13 2:42 ` Janakarajan Natarajan
2015-03-13 2:42 ` [PATCHv2 3/5] Drivers: Staging: ft1000: Refactoring if-else statement Janakarajan Natarajan
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Janakarajan Natarajan @ 2015-03-13 2:42 UTC (permalink / raw)
To: Greg Kroah-Hartman, Joe Perches, devel
Cc: Marek Belisko, linux-kernel, Janakarajan Natarajan
Minor changes to remove extra parenthesis
Signed-off-by: Janakarajan Natarajan <janakarajann@gmail.com>
---
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 2 +-
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index 017c3b9..d4006a4 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -911,7 +911,7 @@ static bool ft1000_receive_cmd(struct net_device *dev, u16 *pbuffer,
tempword = *ppseudohdr++;
for (i = 1; i < 7; i++)
tempword ^= *ppseudohdr++;
- if ((tempword != *ppseudohdr)) {
+ if (tempword != *ppseudohdr) {
pr_debug("Pseudo header checksum mismatch\n");
/* Drop this message */
return false;
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
index 8fb0f5a..8c1e5fc 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
@@ -317,7 +317,7 @@ static int ft1000_open(struct inode *inode, struct file *file)
/* Search for available application info block */
for (i = 0; i < MAX_NUM_APP; i++) {
- if ((dev->app_info[i].fileobject == NULL))
+ if (!dev->app_info[i].fileobject)
break;
}
--
1.9.1
---
This email has been checked for viruses by Avast antivirus software.
http://www.avast.com
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCHv2 3/5] Drivers: Staging: ft1000: Refactoring if-else statement
2015-03-13 2:42 ` [PATCHv2 0/5] ft1000 driver checkpatch.pl fixes Janakarajan Natarajan
2015-03-13 2:42 ` [PATCHv2 1/5] Drivers: Staging: ft1000: Single line if-statement changes Janakarajan Natarajan
2015-03-13 2:42 ` [PATCHv2 2/5] Drivers: Staging: ft1000: Fix extra parenthesis warnings Janakarajan Natarajan
@ 2015-03-13 2:42 ` Janakarajan Natarajan
2015-03-13 2:43 ` [PATCHv2 4/5] Drivers: Staging: ft1000: Fix blank line warning Janakarajan Natarajan
2015-03-13 2:43 ` [PATCHv2 5/5] Drivers: Staging: ft1000: checkpatch.pl header file warning fix Janakarajan Natarajan
4 siblings, 0 replies; 10+ messages in thread
From: Janakarajan Natarajan @ 2015-03-13 2:42 UTC (permalink / raw)
To: Greg Kroah-Hartman, Joe Perches, devel
Cc: Marek Belisko, linux-kernel, Janakarajan Natarajan
Minor change to convert if-else to if statement
Signed-off-by: Janakarajan Natarajan <janakarajann@gmail.com>
---
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index d4006a4..973bfbf 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -1948,11 +1948,10 @@ static irqreturn_t ft1000_interrupt(int irq, void *dev_id)
ft1000_read_reg(dev,
FT1000_REG_MAG_DFSR);
}
- if (tempword & 0x1f) {
- ft1000_copy_up_pkt(dev);
- } else {
+ if (!(tempword & 0x1f))
break;
- }
+
+ ft1000_copy_up_pkt(dev);
cnt++;
} while (cnt < MAX_RCV_LOOP);
--
1.9.1
---
This email has been checked for viruses by Avast antivirus software.
http://www.avast.com
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCHv2 4/5] Drivers: Staging: ft1000: Fix blank line warning
2015-03-13 2:42 ` [PATCHv2 0/5] ft1000 driver checkpatch.pl fixes Janakarajan Natarajan
` (2 preceding siblings ...)
2015-03-13 2:42 ` [PATCHv2 3/5] Drivers: Staging: ft1000: Refactoring if-else statement Janakarajan Natarajan
@ 2015-03-13 2:43 ` Janakarajan Natarajan
2015-03-13 2:43 ` [PATCHv2 5/5] Drivers: Staging: ft1000: checkpatch.pl header file warning fix Janakarajan Natarajan
4 siblings, 0 replies; 10+ messages in thread
From: Janakarajan Natarajan @ 2015-03-13 2:43 UTC (permalink / raw)
To: Greg Kroah-Hartman, Joe Perches, devel
Cc: Marek Belisko, linux-kernel, Janakarajan Natarajan
Merges variable declaration and definition.
Signed-off-by: Janakarajan Natarajan <janakarajann@gmail.com>
---
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index 973bfbf..b43a6fd 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -2006,8 +2006,7 @@ void stop_ft1000_card(struct net_device *dev)
static void ft1000_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
{
- struct ft1000_info *ft_info;
- ft_info = netdev_priv(dev);
+ struct ft1000_info *ft_info = netdev_priv(dev);
strlcpy(info->driver, "ft1000", sizeof(info->driver));
snprintf(info->bus_info, sizeof(info->bus_info), "PCMCIA 0x%lx",
--
1.9.1
---
This email has been checked for viruses by Avast antivirus software.
http://www.avast.com
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCHv2 5/5] Drivers: Staging: ft1000: checkpatch.pl header file warning fix
2015-03-13 2:42 ` [PATCHv2 0/5] ft1000 driver checkpatch.pl fixes Janakarajan Natarajan
` (3 preceding siblings ...)
2015-03-13 2:43 ` [PATCHv2 4/5] Drivers: Staging: ft1000: Fix blank line warning Janakarajan Natarajan
@ 2015-03-13 2:43 ` Janakarajan Natarajan
4 siblings, 0 replies; 10+ messages in thread
From: Janakarajan Natarajan @ 2015-03-13 2:43 UTC (permalink / raw)
To: Greg Kroah-Hartman, Joe Perches, devel
Cc: Marek Belisko, linux-kernel, Janakarajan Natarajan
Replaces <asm/io.h> and <asm/bitops.h> with <linux/io.h> and <linux/bitops.h>
Signed-off-by: Janakarajan Natarajan <janakarajann@gmail.com>
---
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index b43a6fd..a93eaf5 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -28,8 +28,8 @@
#include <linux/timer.h>
#include <linux/interrupt.h>
#include <linux/in.h>
-#include <asm/io.h>
-#include <asm/bitops.h>
+#include <linux/io.h>
+#include <linux/bitops.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
--
1.9.1
---
This email has been checked for viruses by Avast antivirus software.
http://www.avast.com
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCHv2 5/5] Drivers: Staging: ft1000: checkpatch.pl header file warning fix
2015-03-18 20:56 [PATCHv2 0/5] ft1000 driver checkpatch.pl fixes Janakarajan Natarajan
@ 2015-03-18 20:56 ` Janakarajan Natarajan
0 siblings, 0 replies; 10+ messages in thread
From: Janakarajan Natarajan @ 2015-03-18 20:56 UTC (permalink / raw)
To: Greg Kroah-Hartman, Joe Perches, devel
Cc: Marek Belisko, linux-kernel, Janakarajan Natarajan
Replaces <asm/io.h> and <asm/bitops.h> with <linux/io.h> and <linux/bitops.h>
Signed-off-by: Janakarajan Natarajan <janakarajann@gmail.com>
---
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index b43a6fd..a93eaf5 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -28,8 +28,8 @@
#include <linux/timer.h>
#include <linux/interrupt.h>
#include <linux/in.h>
-#include <asm/io.h>
-#include <asm/bitops.h>
+#include <linux/io.h>
+#include <linux/bitops.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
--
1.9.1
---
This email has been checked for viruses by Avast antivirus software.
http://www.avast.com
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-03-18 20:58 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-11 21:03 [PATCH 1/1] Drivers: Staging: ft1000: checkpatch warning fixes Janakarajan Natarajan
2015-03-11 21:20 ` Giedrius Statkevičius
2015-03-11 21:21 ` Joe Perches
2015-03-13 2:42 ` [PATCHv2 0/5] ft1000 driver checkpatch.pl fixes Janakarajan Natarajan
2015-03-13 2:42 ` [PATCHv2 1/5] Drivers: Staging: ft1000: Single line if-statement changes Janakarajan Natarajan
2015-03-13 2:42 ` [PATCHv2 2/5] Drivers: Staging: ft1000: Fix extra parenthesis warnings Janakarajan Natarajan
2015-03-13 2:42 ` [PATCHv2 3/5] Drivers: Staging: ft1000: Refactoring if-else statement Janakarajan Natarajan
2015-03-13 2:43 ` [PATCHv2 4/5] Drivers: Staging: ft1000: Fix blank line warning Janakarajan Natarajan
2015-03-13 2:43 ` [PATCHv2 5/5] Drivers: Staging: ft1000: checkpatch.pl header file warning fix Janakarajan Natarajan
2015-03-18 20:56 [PATCHv2 0/5] ft1000 driver checkpatch.pl fixes Janakarajan Natarajan
2015-03-18 20:56 ` [PATCHv2 5/5] Drivers: Staging: ft1000: checkpatch.pl header file warning fix Janakarajan Natarajan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.