Re: [PATCH] staging: dgap: re-arrange functions for removing forward declarations.

2014-10-13 Thread DaeSeok Youn 
Hi,

2014-10-13 12:25 GMT+09:00 Greg KH :
> On Mon, Oct 13, 2014 at 11:34:25AM +0900, Daeseok Youn wrote:
>> Re-arrange the functions for removing forward declarations.
>>
>> Signed-off-by: Daeseok Youn 
>> ---
>> This patch has too many changes for re-arranging the functions.
>> So I wonder that I should break this up into smaller patches.
>
> Are the .o files identical before and after this patch?  If so, it's
> fine.
Ok. I will check for that.

Thanks.

regards,
Daeseok Youn.

>
> thanks,
>
> greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH] staging: rtl8188eu: Fix coding style space related ERROR problems

2014-10-13 Thread Jia He 
This fixes space related ERROR reports by checkpatch.pl
Generated by $ git ls-files "drivers/staging/rtl8188eu/*.[ch]" | \
  xargs ./scripts/checkpatch.pl -f --fix-inplace --strict --types=SPACING
Already checked by text comparasion
$git diff -w 
and binary comparasion of r8188eu.ko
$objdiff diff  

Signed-off-by: Jia He 
Cc: Greg Kroah-Hartman 
---
 drivers/staging/rtl8188eu/core/rtw_cmd.c  |  2 +-
 drivers/staging/rtl8188eu/core/rtw_ieee80211.c| 16 +-
 drivers/staging/rtl8188eu/core/rtw_mlme.c |  2 +-
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 22 +++---
 drivers/staging/rtl8188eu/core/rtw_pwrctrl.c  |  2 +-
 drivers/staging/rtl8188eu/core/rtw_recv.c | 12 
 drivers/staging/rtl8188eu/core/rtw_security.c | 20 ++---
 drivers/staging/rtl8188eu/core/rtw_sta_mgt.c  |  2 +-
 drivers/staging/rtl8188eu/core/rtw_xmit.c | 10 +++
 drivers/staging/rtl8188eu/hal/bb_cfg.c|  4 +--
 drivers/staging/rtl8188eu/hal/fw.c|  8 ++---
 drivers/staging/rtl8188eu/hal/mac_cfg.c   |  2 +-
 drivers/staging/rtl8188eu/hal/odm.c   |  8 ++---
 drivers/staging/rtl8188eu/hal/odm_HWConfig.c  |  2 +-
 drivers/staging/rtl8188eu/hal/odm_RTL8188E.c  |  2 +-
 drivers/staging/rtl8188eu/hal/phy.c   |  2 +-
 drivers/staging/rtl8188eu/hal/rf.c|  4 +--
 drivers/staging/rtl8188eu/hal/rf_cfg.c|  4 +--
 drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c  |  2 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c|  2 +-
 drivers/staging/rtl8188eu/hal/usb_halinit.c   |  2 +-
 drivers/staging/rtl8188eu/include/ieee80211_ext.h | 20 ++---
 drivers/staging/rtl8188eu/include/odm_debug.h |  2 +-
 drivers/staging/rtl8188eu/include/osdep_service.h |  4 +--
 drivers/staging/rtl8188eu/include/rtw_debug.h |  2 +-
 drivers/staging/rtl8188eu/include/rtw_led.h   |  2 +-
 drivers/staging/rtl8188eu/include/rtw_mlme_ext.h  | 26 
 drivers/staging/rtl8188eu/include/wifi.h  | 36 +++
 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c|  4 +--
 drivers/staging/rtl8188eu/os_dep/os_intfs.c   |  2 +-
 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c  |  4 +--
 drivers/staging/rtl8188eu/os_dep/xmit_linux.c |  2 +-
 32 files changed, 117 insertions(+), 117 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c 
b/drivers/staging/rtl8188eu/core/rtw_cmd.c
index 9935e66..7b59a10 100644
--- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
+++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
@@ -638,7 +638,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 
unicast_key)
ether_addr_copy(psetstakey_para->addr, sta->hwaddr);
 
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))
-   psetstakey_para->algorithm = (unsigned char) 
psecuritypriv->dot11PrivacyAlgrthm;
+   psetstakey_para->algorithm = (unsigned 
char)psecuritypriv->dot11PrivacyAlgrthm;
else
GET_ENCRY_ALGO(psecuritypriv, sta, psetstakey_para->algorithm, 
false);
 
diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c 
b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
index 755d3ef..f2c3ca7 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
@@ -159,7 +159,7 @@ u8 *rtw_set_ie
return pbuf + len + 2;
 }
 
-inline u8 *rtw_set_ie_ch_switch (u8 *buf, u32 *buf_len, u8 ch_switch_mode,
+inline u8 *rtw_set_ie_ch_switch(u8 *buf, u32 *buf_len, u8 ch_switch_mode,
u8 new_ch, u8 ch_switch_cnt)
 {
u8 ie_data[3];
@@ -870,7 +870,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, 
uint elen,
if (elen < 4) {
if (show_errors) {
DBG_88E("short vendor specific information element 
ignored (len=%lu)\n",
-   (unsigned long) elen);
+   (unsigned long)elen);
}
return -1;
}
@@ -890,7 +890,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, 
uint elen,
case WME_OUI_TYPE: /* this is a Wi-Fi WME info. element */
if (elen < 5) {
DBG_88E("short WME information element ignored 
(len=%lu)\n",
-   (unsigned long) elen);
+   (unsigned long)elen);
return -1;
}
switch (pos[4]) {
@@ -905,7 +905,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, 
uint elen,
break;
default:
DBG_88E("unknown WME information element 
ignored (subtype=%d len=%lu)\n",
-   pos[4], (unsigned long) elen);
+   pos[4], (unsig

Re: [PATCH] staging: comedi: drivers: comedi_bond.c: Changed from using strncat to strlcat

2014-10-13 Thread Ian Abbott 

On 12/10/14 13:23, Rickard Strandqvist wrote:

Changed from using strncat to strlcat to simplify the code

Signed-off-by: Rickard Strandqvist 
---
  drivers/staging/comedi/drivers/comedi_bond.c |6 ++
  1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/drivers/comedi_bond.c 
b/drivers/staging/comedi/drivers/comedi_bond.c
index 8450c99..5d19861 100644
--- a/drivers/staging/comedi/drivers/comedi_bond.c
+++ b/drivers/staging/comedi/drivers/comedi_bond.c
@@ -262,12 +262,10 @@ static int do_dev_config(struct comedi_device *dev, 
struct comedi_devconfig *it)
{
/* Append dev:subdev to devpriv->name */
char buf[20];
-   int left =
-   MAX_BOARD_NAME - strlen(devpriv->name) - 1;
snprintf(buf, sizeof(buf), "%u:%u ",
 bdev->minor, bdev->subdev);
-   buf[sizeof(buf) - 1] = 0;
-   strncat(devpriv->name, buf, left);
+   strlcat(devpriv->name, buf,
+   sizeof(devpriv->name));
}

}



Looks good.  Additionally, the #define MAX_BOARD_NAME could be 
eliminated as now it is only used to to set the length of the 'name' 
member in 'struct comedi_bond_private'.


Reviewed-by: Ian Abbott 

--
-=( Ian Abbott @ MEV Ltd.E-mail:  )=-
-=(  Web: http://www.mev.co.uk/  )=-
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH 1/3] staging: comedi: usbduxsigma: updated contact details and status

2014-10-13 Thread Ian Abbott 

On 10/10/14 20:32, Bernd Porr wrote:

I've updated my contact details of the driver. I've also tested it
thoroughly and it works perfectly. I've changed the status to stable.

Signed-off-by: Bernd Porr 
---
  drivers/staging/comedi/drivers/usbduxsigma.c | 8 
  1 file changed, 4 insertions(+), 4 deletions(-)


Reviewed-by: Ian Abbott 

--
-=( Ian Abbott @ MEV Ltd.E-mail:  )=-
-=(  Web: http://www.mev.co.uk/  )=-
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH 2/3] staging: comedi: usbdux: updated contact details / comments

2014-10-13 Thread Ian Abbott 

On 10/10/14 20:34, Bernd Porr wrote:

I've updated my contact details and removed obsolete comments.

Signed-off-by: Bernd Porr 
---
  drivers/staging/comedi/drivers/usbdux.c | 59 -
  1 file changed, 28 insertions(+), 31 deletions(-)


Reviewed-by: Ian Abbott 

--
-=( Ian Abbott @ MEV Ltd.E-mail:  )=-
-=(  Web: http://www.mev.co.uk/  )=-
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH 3/3] staging: comedi: usbduxfast: updated address details

2014-10-13 Thread Ian Abbott 

On 10/10/14 20:35, Bernd Porr wrote:

Updated the range of years, e-mail and added driver desription as
usually done in comedi.

Signed-off-by: Bernd Porr 
---
  drivers/staging/comedi/drivers/usbduxfast.c | 11 ++-
  1 file changed, 10 insertions(+), 1 deletion(-)


Reviewed-by: Ian Abbott 

--
-=( Ian Abbott @ MEV Ltd.E-mail:  )=-
-=(  Web: http://www.mev.co.uk/  )=-
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH] staging: rtl8188eu: Fix coding style space related ERROR problems

2014-10-13 Thread Joe Perches 
On Mon, 2014-10-13 at 16:47 +0800, Jia He wrote:
> This fixes space related ERROR reports by checkpatch.pl
> Generated by $ git ls-files "drivers/staging/rtl8188eu/*.[ch]" | \
>   xargs ./scripts/checkpatch.pl -f --fix-inplace --strict --types=SPACING

checkpatch isn't perfect.

Always verify the output before submitting automated changes.

> diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c 
> b/drivers/staging/rtl8188eu/core/rtw_xmit.c
[]
> @@ -772,7 +772,7 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, 
> struct xmit_frame *pxmi
>   return _SUCCESS;
>  }
>  
> -s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib 
> *pattrib)
> +s32 rtw_make_wlanhdr(struct adapter *padapter , u8 *hdr, struct pkt_attrib 
> *pattrib)

The space after padapter should be removed.

> diff --git a/drivers/staging/rtl8188eu/hal/bb_cfg.c 
> b/drivers/staging/rtl8188eu/hal/bb_cfg.c

> @@ -552,7 +552,7 @@ static void store_pwrindex_offset(struct adapter 
> *Adapter, u32 regaddr, u32 bitm
>   }
>  }
>  
> -static void rtl_addr_delay(struct adapter *adapt, u32 addr, u32 bit_mask 
> ,u32 data)
> +static void rtl_addr_delay(struct adapter *adapt, u32 addr, u32 bit_mask , 
> u32 data)

likewise, the space after bit_mask too

> diff --git a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c 
> b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
[]
> @@ -2059,7 +2059,7 @@ static int wpa_supplicant_ioctl(struct net_device *dev, 
> struct iw_point *p)
>   struct ieee_param *param;
>   uint ret = 0;
>  
> - if (p->length < sizeof(struct ieee_param) || !p->pointer) {
> + if (p->length < sizeof(struct ieee_param)|| !p->pointer) {

checkpatch defect, nothing wrong with original.


___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 2/3] staging: comedi: cb_pcimdas: update driver comment

2014-10-13 Thread Ian Abbott 
The Comedi driver comment mentions a couple of manual configuration
options, but manual configuration via the COMEDI_DEVCONFIG ioctl and
comedi "attach" handler is no longer supported by this driver.  Update
the comment appropriately.

Signed-off-by: Ian Abbott 
---
 drivers/staging/comedi/drivers/cb_pcimdas.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c 
b/drivers/staging/comedi/drivers/cb_pcimdas.c
index 804b3c3..433941a 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -27,8 +27,10 @@
  * Written to support the PCIM-DAS1602/16 on a 2.4 series kernel.
  *
  * Configuration Options:
- * [0] - PCI bus number
- * [1] - PCI slot number
+ *   none
+ *
+ * Manual configuration of PCI cards is not supported; they are configured
+ * automatically.
  *
  * Developed from cb_pcidas and skel by Richard Bytheway (moce...@sucs.org).
  * Only supports DIO, AO and simple AI in it's present form.
-- 
2.1.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 0/3] staging: comedi: cb_pcimdas: support PCIe-DAS1602/16

2014-10-13 Thread Ian Abbott 
Fix up the block comment style and add support for the PCIe-DAS1602/16.
This is the PCI-Express version of the PCIM-DAS1602/16 and is software
compatible with it, apart from a different PCI device ID.

1) staging: comedi: cb_pcimdas: use preferred block comment style
2) staging: comedi: cb_pcimdas: update driver comment
3) staging: comedi: cb_pcimdas: add support for PCIe-DAS1602/16

 drivers/staging/comedi/Kconfig  |  4 +-
 drivers/staging/comedi/drivers/cb_pcimdas.c | 82 -
 2 files changed, 46 insertions(+), 40 deletions(-)
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 1/3] staging: comedi: cb_pcimdas: use preferred block comment style

2014-10-13 Thread Ian Abbott 
Use the preferred block comment style for the copyright and Comedi
driver description header comments.

Signed-off-by: Ian Abbott 
---
 drivers/staging/comedi/drivers/cb_pcimdas.c | 71 +++--
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c 
b/drivers/staging/comedi/drivers/cb_pcimdas.c
index fe4d254..804b3c3 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -1,40 +1,41 @@
 /*
-comedi/drivers/cb_pcimdas.c
-Comedi driver for Computer Boards PCIM-DAS1602/16
-
-COMEDI - Linux Control and Measurement Device Interface
-Copyright (C) 2000 David A. Schleef 
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-*/
+ * comedi/drivers/cb_pcimdas.c
+ * Comedi driver for Computer Boards PCIM-DAS1602/16
+ *
+ * COMEDI - Linux Control and Measurement Device Interface
+ * Copyright (C) 2000 David A. Schleef 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 /*
-Driver: cb_pcimdas
-Description: Measurement Computing PCI Migration series boards
-Devices: [ComputerBoards] PCIM-DAS1602/16 (cb_pcimdas)
-Author: Richard Bytheway
-Updated: Wed, 13 Nov 2002 12:34:56 +
-Status: experimental
-
-Written to support the PCIM-DAS1602/16 on a 2.4 series kernel.
-
-Configuration Options:
-[0] - PCI bus number
-[1] - PCI slot number
-
-Developed from cb_pcidas and skel by Richard Bytheway (moce...@sucs.org).
-Only supports DIO, AO and simple AI in it's present form.
-No interrupts, multi channel or FIFO AI,
-although the card looks like it could support this.
-See http://www.mccdaq.com/PDFs/Manuals/pcim-das1602-16.pdf for more details.
-*/
+ * Driver: cb_pcimdas
+ * Description: Measurement Computing PCI Migration series boards
+ * Devices: [ComputerBoards] PCIM-DAS1602/16 (cb_pcimdas)
+ * Author: Richard Bytheway
+ * Updated: Wed, 13 Nov 2002 12:34:56 +
+ * Status: experimental
+ *
+ * Written to support the PCIM-DAS1602/16 on a 2.4 series kernel.
+ *
+ * Configuration Options:
+ * [0] - PCI bus number
+ * [1] - PCI slot number
+ *
+ * Developed from cb_pcidas and skel by Richard Bytheway (moce...@sucs.org).
+ * Only supports DIO, AO and simple AI in it's present form.
+ * No interrupts, multi channel or FIFO AI,
+ * although the card looks like it could support this.
+ * See http://www.mccdaq.com/PDFs/Manuals/pcim-das1602-16.pdf for more details.
+ */
 
 #include 
 #include 
-- 
2.1.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 3/3] staging: comedi: cb_pcimdas: add support for PCIe-DAS1602/16

2014-10-13 Thread Ian Abbott 
The Measurement Computing PCIe-DAS1602/16 is a PCI-Express version of
the PCIM-DAS1602/16, but has a different PCI device ID.  Add support
for this device and update the driver description, Kconfig description
and MODULE_DESCRIPTION.

Thanks to Christoph Langbein for supplying the PCI device ID.

Signed-off-by: Ian Abbott 
---
 drivers/staging/comedi/Kconfig  |  4 ++--
 drivers/staging/comedi/drivers/cb_pcimdas.c | 21 -
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index a8bc2b5..77c5013 100644
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -939,11 +939,11 @@ config COMEDI_CB_PCIDDA
  called cb_pcidda.
 
 config COMEDI_CB_PCIMDAS
-   tristate "MeasurementComputing PCIM-DAS1602/16 support"
+   tristate "MeasurementComputing PCIM-DAS1602/16, PCIe-DAS1602/16 support"
select COMEDI_8255
---help---
  Enable support for ComputerBoards/MeasurementComputing PCI Migration
- series PCIM-DAS1602/16
+ series PCIM-DAS1602/16 and PCIe-DAS1602/16.
 
  To compile this driver as a module, choose M here: the module will be
  called cb_pcimdas.
diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c 
b/drivers/staging/comedi/drivers/cb_pcimdas.c
index 433941a..73e5c96 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -1,6 +1,6 @@
 /*
  * comedi/drivers/cb_pcimdas.c
- * Comedi driver for Computer Boards PCIM-DAS1602/16
+ * Comedi driver for Computer Boards PCIM-DAS1602/16 and PCIe-DAS1602/16
  *
  * COMEDI - Linux Control and Measurement Device Interface
  * Copyright (C) 2000 David A. Schleef 
@@ -19,24 +19,26 @@
 /*
  * Driver: cb_pcimdas
  * Description: Measurement Computing PCI Migration series boards
- * Devices: [ComputerBoards] PCIM-DAS1602/16 (cb_pcimdas)
+ * Devices: [ComputerBoards] PCIM-DAS1602/16 (cb_pcimdas), PCIe-DAS1602/16
  * Author: Richard Bytheway
- * Updated: Wed, 13 Nov 2002 12:34:56 +
+ * Updated: Mon, 13 Oct 2014 11:57:39 +
  * Status: experimental
  *
- * Written to support the PCIM-DAS1602/16 on a 2.4 series kernel.
+ * Written to support the PCIM-DAS1602/16 and PCIe-DAS1602/16.
  *
  * Configuration Options:
  *   none
  *
- * Manual configuration of PCI cards is not supported; they are configured
+ * Manual configuration of PCI(e) cards is not supported; they are configured
  * automatically.
  *
  * Developed from cb_pcidas and skel by Richard Bytheway (moce...@sucs.org).
  * Only supports DIO, AO and simple AI in it's present form.
  * No interrupts, multi channel or FIFO AI,
  * although the card looks like it could support this.
- * See http://www.mccdaq.com/PDFs/Manuals/pcim-das1602-16.pdf for more details.
+ *
+ * http://www.mccdaq.com/PDFs/Manuals/pcim-das1602-16.pdf
+ * http://www.mccdaq.com/PDFs/Manuals/pcie-das1602-16.pdf
  */
 
 #include 
@@ -48,7 +50,7 @@
 #include "plx9052.h"
 #include "8255.h"
 
-/* Registers for the PCIM-DAS1602/16 */
+/* Registers for the PCIM-DAS1602/16 and PCIe-DAS1602/16 */
 
 /* DAC Offsets */
 #define ADC_TRIG 0
@@ -254,7 +256,8 @@ static int cb_pcimdas_pci_probe(struct pci_dev *dev,
 }
 
 static const struct pci_device_id cb_pcimdas_pci_table[] = {
-   { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0056) },
+   { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0056) },   /* PCIM-DAS1602/16 */
+   { PCI_DEVICE(PCI_VENDOR_ID_CB, 0x0115) },   /* PCIe-DAS1602/16 */
{ 0 }
 };
 MODULE_DEVICE_TABLE(pci, cb_pcimdas_pci_table);
@@ -268,5 +271,5 @@ static struct pci_driver cb_pcimdas_pci_driver = {
 module_comedi_pci_driver(cb_pcimdas_driver, cb_pcimdas_pci_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org";);
-MODULE_DESCRIPTION("Comedi low-level driver");
+MODULE_DESCRIPTION("Comedi driver for PCIM-DAS1602/16 and PCIe-DAS1602/16");
 MODULE_LICENSE("GPL");
-- 
2.1.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH] staging: lustre: lustre: ptlrpc: sec.c: Replacing strncat with strlcat to avoid overwrite size

2014-10-13 Thread Chen Gang 
On 10/12/14 23:55, Rickard Strandqvist wrote:
> Changed from using strncat with strlcat to avoid overwrite the max size.
> Take the opportunity to change a snprint to strlcpy.
> 
> Signed-off-by: Rickard Strandqvist 
> ---
>  drivers/staging/lustre/lustre/ptlrpc/sec.c |5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec.c 
> b/drivers/staging/lustre/lustre/ptlrpc/sec.c
> index 5cff7ee..d276e98 100644
> --- a/drivers/staging/lustre/lustre/ptlrpc/sec.c
> +++ b/drivers/staging/lustre/lustre/ptlrpc/sec.c
> @@ -209,7 +209,7 @@ EXPORT_SYMBOL(sptlrpc_flavor2name_bulk);
>  
>  char *sptlrpc_flavor2name(struct sptlrpc_flavor *sf, char *buf, int bufsize)
>  {
> - snprintf(buf, bufsize, "%s", sptlrpc_flavor2name_base(sf->sf_rpc));
> + strlcpy(buf, sptlrpc_flavor2name_base(sf->sf_rpc), bufsize);
>  
>   /*
>* currently we don't support customized bulk specification for
> @@ -220,10 +220,9 @@ char *sptlrpc_flavor2name(struct sptlrpc_flavor *sf, 
> char *buf, int bufsize)
>  
>   bspec[0] = '-';
>   sptlrpc_flavor2name_bulk(sf, &bspec[1], sizeof(bspec) - 1);
> - strncat(buf, bspec, bufsize);
> + strlcat(buf, bspec, bufsize);
>   }
>  
> - buf[bufsize - 1] = '\0';
>   return buf;
>  }
>  EXPORT_SYMBOL(sptlrpc_flavor2name);
> 

At least for me, it is OK.

Acked-by: Chen Gang 

Thanks.
-- 
Chen Gang

Open, share, and attitude like air, water, and life which God blessed
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH] staging: dgap: re-arrange functions for removing forward declarations.

2014-10-13 Thread Joe Perches 
On Mon, 2014-10-13 at 17:01 +0900, DaeSeok Youn wrote:
> Hi,
> 
> 2014-10-13 12:25 GMT+09:00 Greg KH :
> > On Mon, Oct 13, 2014 at 11:34:25AM +0900, Daeseok Youn wrote:
> >> Re-arrange the functions for removing forward declarations.
> >>
> >> Signed-off-by: Daeseok Youn 
> >> ---
> >> This patch has too many changes for re-arranging the functions.
> >> So I wonder that I should break this up into smaller patches.
> >
> > Are the .o files identical before and after this patch?  If so, it's
> > fine.
> Ok. I will check for that.

The .o files shouldn't be identical after function reordering.

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 2/2] staging: comedi: comedidev.h: clarify async->event error/cancel detection

2014-10-13 Thread H Hartley Sweeten 
Introduce COMEDI_CB_ERROR_MASK and COMEDI_CB_CANCEL_MASK to clarify the
async->events that indicate errors and cancel an async command.

Use the new defines to tidy up and clarify the code.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Cc: Greg Kroah-Hartman 
---
 drivers/staging/comedi/comedi_fops.c  | 18 --
 drivers/staging/comedi/comedidev.h|  6 ++
 drivers/staging/comedi/drivers.c  |  2 +-
 drivers/staging/comedi/drivers/amplc_pci230.c | 10 ++
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/drivers/staging/comedi/comedi_fops.c 
b/drivers/staging/comedi/comedi_fops.c
index 495969f..8a0416f 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -1555,9 +1555,7 @@ static int do_cmd_ioctl(struct comedi_device *dev,
 
comedi_buf_reset(s);
 
-   async->cb_mask =
-   COMEDI_CB_EOA | COMEDI_CB_BLOCK | COMEDI_CB_ERROR |
-   COMEDI_CB_OVERFLOW;
+   async->cb_mask = COMEDI_CB_BLOCK | COMEDI_CB_CANCEL_MASK;
if (async->cmd.flags & CMDF_WAKE_EOS)
async->cb_mask |= COMEDI_CB_EOS;
 
@@ -2393,14 +2391,14 @@ void comedi_event(struct comedi_device *dev, struct 
comedi_subdevice *s)
if (!comedi_is_subdevice_running(s))
return;
 
-   if (s->
-   async->events & (COMEDI_CB_EOA | COMEDI_CB_ERROR |
-COMEDI_CB_OVERFLOW)) {
+   if (s->async->events & COMEDI_CB_CANCEL_MASK)
runflags_mask |= SRF_RUNNING;
-   }
-   /* remember if an error event has occurred, so an error
-* can be returned the next time the user does a read() */
-   if (s->async->events & (COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW)) {
+
+   /*
+* Remember if an error event has occurred, so an error
+* can be returned the next time the user does a read().
+*/
+   if (s->async->events & COMEDI_CB_ERROR_MASK) {
runflags_mask |= SRF_ERROR;
runflags |= SRF_ERROR;
}
diff --git a/drivers/staging/comedi/comedidev.h 
b/drivers/staging/comedi/comedidev.h
index 0b504b1..fb8ff84 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -221,6 +221,9 @@ struct comedi_async {
  * @COMEDI_CB_EOBUF:   DEPRECATED: end of buffer
  * @COMEDI_CB_ERROR:   card error during acquisition
  * @COMEDI_CB_OVERFLOW:buffer overflow/underflow
+ *
+ * @COMEDI_CB_ERROR_MASK:  events that indicate an error has occurred
+ * @COMEDI_CB_CANCEL_MASK: events that will cancel an async command
  */
 #define COMEDI_CB_EOS  (1 << 0)
 #define COMEDI_CB_EOA  (1 << 1)
@@ -229,6 +232,9 @@ struct comedi_async {
 #define COMEDI_CB_ERROR(1 << 4)
 #define COMEDI_CB_OVERFLOW (1 << 5)
 
+#define COMEDI_CB_ERROR_MASK   (COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW)
+#define COMEDI_CB_CANCEL_MASK  (COMEDI_CB_EOA | COMEDI_CB_ERROR_MASK)
+
 struct comedi_driver {
struct comedi_driver *next;
 
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 3e5bccb..b282a11 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -376,7 +376,7 @@ unsigned int comedi_handle_events(struct comedi_device *dev,
if (events == 0)
return events;
 
-   if (events & (COMEDI_CB_EOA | COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW))
+   if (events & COMEDI_CB_CANCEL_MASK)
s->cancel(dev, s);
 
comedi_event(dev, s);
diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c 
b/drivers/staging/comedi/drivers/amplc_pci230.c
index d1e4213..fe5e147 100644
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -1119,7 +1119,6 @@ static bool pci230_handle_ao_fifo(struct comedi_device 
*dev,
unsigned short dacstat;
unsigned int i, n;
unsigned int events = 0;
-   bool running;
 
/* Get DAC FIFO status. */
dacstat = inw(devpriv->daqio + PCI230_DACCON);
@@ -1201,12 +1200,8 @@ static bool pci230_handle_ao_fifo(struct comedi_device 
*dev,
events |= COMEDI_CB_OVERFLOW | COMEDI_CB_ERROR;
}
}
-   if (events & (COMEDI_CB_EOA | COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW))
-   running = false;
-   else
-   running = true;
async->events |= events;
-   return running;
+   return !(async->events & COMEDI_CB_CANCEL_MASK);
 }
 
 static int pci230_ao_inttrig_scan_begin(struct comedi_device *dev,
@@ -2128,8 +2123,7 @@ static void pci230_handle_ai(struct comedi_device *dev,
events |= COMEDI_CB_BLOCK;
}
async->events |= events;
-   if (!(async->events & (COMEDI_CB_EOA | COMEDI_CB_ERROR |
-  COMEDI_CB_OVERFLOW))) {
+   if (!(async->events & COMEDI_CB_CANCEL_MASK))

[PATCH 1/2] staging: comedi: comedidev.h: don't expose COMEDI_CB_* defines to userspace

2014-10-13 Thread H Hartley Sweeten 
The COMEDI_CB_* defines are the comedi_async "events" that the drivers set
to let the core detect the state of running async commands. These "events"
are only relevant to the kernel modules and should not be exposed to
userspace in the comedi.h user API header.

Move the defines to comedidev.h to avoid exposing them. For aesthetics,
convert the defines to bit shifts to better indicate that they are bitmask
values. Cleanup the documentation.

Signed-off-by: H Hartley Sweeten 
Cc: Ian Abbott 
Cc: Greg Kroah-Hartman 
---
 drivers/staging/comedi/comedi.h| 11 ---
 drivers/staging/comedi/comedidev.h | 16 
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index c8c99e6..f302ce6 100644
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -514,17 +514,6 @@ struct comedi_bufinfo {
 
 #define COMEDI_MIN_SPEED   ((unsigned int)0x)
 
-/* callback stuff */
-/* only relevant to kernel modules. */
-
-#define COMEDI_CB_EOS  1   /* end of scan */
-#define COMEDI_CB_EOA  2   /* end of acquisition/output */
-#define COMEDI_CB_BLOCK4   /* data has arrived:
-* wakes up read() / write() */
-#define COMEDI_CB_EOBUF8   /* DEPRECATED: end of buffer */
-#define COMEDI_CB_ERROR16  /* card error during 
acquisition */
-#define COMEDI_CB_OVERFLOW 32  /* buffer overflow/underflow */
-
 /**/
 /* everything after this line is ALPHA */
 /**/
diff --git a/drivers/staging/comedi/comedidev.h 
b/drivers/staging/comedi/comedidev.h
index 1b2bbd5..0b504b1 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -213,6 +213,22 @@ struct comedi_async {
   unsigned int x);
 };
 
+/**
+ * comedi_async callback "events"
+ * @COMEDI_CB_EOS: end-of-scan
+ * @COMEDI_CB_EOA: end-of-acquisition/output
+ * @COMEDI_CB_BLOCK:   data has arrived, wakes up read() / write()
+ * @COMEDI_CB_EOBUF:   DEPRECATED: end of buffer
+ * @COMEDI_CB_ERROR:   card error during acquisition
+ * @COMEDI_CB_OVERFLOW:buffer overflow/underflow
+ */
+#define COMEDI_CB_EOS  (1 << 0)
+#define COMEDI_CB_EOA  (1 << 1)
+#define COMEDI_CB_BLOCK(1 << 2)
+#define COMEDI_CB_EOBUF(1 << 3)
+#define COMEDI_CB_ERROR(1 << 4)
+#define COMEDI_CB_OVERFLOW (1 << 5)
+
 struct comedi_driver {
struct comedi_driver *next;
 
-- 
2.0.3

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH] staging: dgnc: Fix a possible crash when the class_create fails

2014-10-13 Thread devendranaga4 
From: Devendra Naga 

The class_create function can return a pointer with an error code
stuffed inside it if it fails. Handled it to make sure
device_register doesn't get an invalid pointer.

Also removed assignment of rc to 0 in the beginning of function
because it gets changed after the call to register_chrdev function.

Signed-off-by: Devendra Naga 
---
 drivers/staging/dgnc/dgnc_driver.c |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/dgnc/dgnc_driver.c 
b/drivers/staging/dgnc/dgnc_driver.c
index 2154665..72bfb29 100644
--- a/drivers/staging/dgnc/dgnc_driver.c
+++ b/drivers/staging/dgnc/dgnc_driver.c
@@ -248,7 +248,7 @@ module_exit(dgnc_cleanup_module);
  */
 static int dgnc_start(void)
 {
-   int rc = 0;
+   int rc;
unsigned long flags;
 
/* make sure that the globals are init'd before we do anything else */
@@ -271,6 +271,12 @@ static int dgnc_start(void)
dgnc_Major = rc;
 
dgnc_class = class_create(THIS_MODULE, "dgnc_mgmt");
+   if (IS_ERR(dgnc_class)) {
+   rc = PTR_ERR(dgnc_class);
+   APR(("Can't creat dgnc class (%d)\n", rc));
+   goto bad;
+   }
+
device_create(dgnc_class, NULL,
MKDEV(dgnc_Major, 0),
NULL, "dgnc_mgmt");
@@ -297,6 +303,10 @@ static int dgnc_start(void)
add_timer(&dgnc_poll_timer);
 
return rc;
+
+bad:
+   unregister_chrdev(dgnc_Major, "dgnc");
+   return rc;
 }
 
 /* returns count (>= 0), or negative on error */
-- 
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 0/2] staging: comedi: tidy up the async event defines

2014-10-13 Thread H Hartley Sweeten 
The async event defines, COMEDI_CB_*, are only used in the kernel. They should
not be exposed to userspace in the comedi.h uapi header. Move the defines to
the comedidev.h kernel header and tidy up the documentation.

Also, introduce some mask defines to clarify the events that indicate error
conditions and that cancel an async command.

H Hartley Sweeten (2):
  staging: comedi: comedidev.h: don't expose COMEDI_CB_* defines to userspace
  staging: comedi: comedidev.h: clarify async->event error/cancel detection

 drivers/staging/comedi/comedi.h   | 11 ---
 drivers/staging/comedi/comedi_fops.c  | 18 --
 drivers/staging/comedi/comedidev.h| 22 ++
 drivers/staging/comedi/drivers.c  |  2 +-
 drivers/staging/comedi/drivers/amplc_pci230.c | 10 ++
 5 files changed, 33 insertions(+), 30 deletions(-)

-- 
2.0.3

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH] staging: comedi: drivers: comedi_bond.c: Changed from using strncat to strlcat

2014-10-13 Thread Rickard Strandqvist 
2014-10-13 11:14 GMT+02:00 Ian Abbott :
> On 12/10/14 13:23, Rickard Strandqvist wrote:
>>
>> Changed from using strncat to strlcat to simplify the code
>>
>> Signed-off-by: Rickard Strandqvist
>> 
>> ---
>>   drivers/staging/comedi/drivers/comedi_bond.c |6 ++
>>   1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/staging/comedi/drivers/comedi_bond.c
>> b/drivers/staging/comedi/drivers/comedi_bond.c
>> index 8450c99..5d19861 100644
>> --- a/drivers/staging/comedi/drivers/comedi_bond.c
>> +++ b/drivers/staging/comedi/drivers/comedi_bond.c
>> @@ -262,12 +262,10 @@ static int do_dev_config(struct comedi_device *dev,
>> struct comedi_devconfig *it)
>> {
>> /* Append dev:subdev to devpriv->name */
>> char buf[20];
>> -   int left =
>> -   MAX_BOARD_NAME - strlen(devpriv->name)
>> - 1;
>> snprintf(buf, sizeof(buf), "%u:%u ",
>>  bdev->minor, bdev->subdev);
>> -   buf[sizeof(buf) - 1] = 0;
>> -   strncat(devpriv->name, buf, left);
>> +   strlcat(devpriv->name, buf,
>> +   sizeof(devpriv->name));
>> }
>>
>> }
>>
>
> Looks good.  Additionally, the #define MAX_BOARD_NAME could be eliminated as
> now it is only used to to set the length of the 'name' member in 'struct
> comedi_bond_private'.
>
> Reviewed-by: Ian Abbott 


Hi

Sounds like a good idea Ian.
I'll send a new patch where I removed the MAX_BOARD_NAME  tomorrow.


Kind regards
Rickard Strandqvist
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH] staging: wlan-ng: Renamed prism2_fragmenthreshold in prism2mib.c

2014-10-13 Thread Erich Cordoba 
The idea was to reduce the length of the line (to 80 characters) by renaming 
this function. 
But, now reviewing the result I can see that the name of the function has lost 
meaning. 
Please ignore this patch. 

-Erich

12.10.2014, 21:28, "Greg KH" :
> On Sun, Oct 12, 2014 at 09:29:32PM -0500, Erich Cordoba Malibran wrote:
>>  From: Erich Cordoba Malibran 
>>
>>  Renamed function to fix style issues.
>
> Why is changing a name, to a misspelled one, a "style issue fix"?
>>  Signed-off-by: Erich Cordoba Malibran 
>>  ---
>>   drivers/staging/wlan-ng/prism2mib.c | 26 +-
>>   1 file changed, 13 insertions(+), 13 deletions(-)
>>
>>  diff --git a/drivers/staging/wlan-ng/prism2mib.c 
>> b/drivers/staging/wlan-ng/prism2mib.c
>>  index 0163e06..30d224f 100644
>>  --- a/drivers/staging/wlan-ng/prism2mib.c
>>  +++ b/drivers/staging/wlan-ng/prism2mib.c
>>  @@ -132,12 +132,12 @@ static int prism2mib_excludeunencrypted(struct mibrec 
>> *mib,
>>   struct p80211msg_dot11req_mibset 
>> *msg,
>>   void *data);
>>
>>  -static int prism2mib_fragmentationthreshold(struct mibrec *mib,
>>  -    int isget,
>>  -    wlandevice_t *wlandev,
>>  -    hfa384x_t *hw,
>>  -    struct p80211msg_dot11req_mibset *msg,
>>  -    void *data);
>>  +static int prism2mib_fragmenthreshold(struct mibrec *mib,
>>  +  int isget,
>>  +  wlandevice_t *wlandev,
>>  +  hfa384x_t *hw,
>>  +  struct p80211msg_dot11req_mibset *msg,
>>  +  void *data);
>>
>>   static int prism2mib_priv(struct mibrec *mib,
>> int isget,
>>  @@ -198,7 +198,7 @@ static struct mibrec mibtab[] = {
>>   {DIDmib_dot11mac_dot11OperationTable_dot11FragmentationThreshold,
>>    F_STA | F_READ | F_WRITE,
>>    HFA384x_RID_FRAGTHRESH, 0, 0,
>>  - prism2mib_fragmentationthreshold},
>>  + prism2mib_fragmenthreshold},
>>   {DIDmib_dot11mac_dot11OperationTable_dot11MaxTransmitMSDULifetime,
>>    F_STA | F_READ,
>>    HFA384x_RID_MAXTXLIFETIME, 0, 0,
>>  @@ -660,12 +660,12 @@ static int prism2mib_excludeunencrypted(struct mibrec 
>> *mib,
>>   *
>>   */
>>
>>  -static int prism2mib_fragmentationthreshold(struct mibrec *mib,
>>  -    int isget,
>>  -    wlandevice_t *wlandev,
>>  -    hfa384x_t *hw,
>>  -    struct p80211msg_dot11req_mibset *msg,
>>  -    void *data)
>>  +static int prism2mib_fragmenthreshold(struct mibrec *mib,
>>  +  int isget,
>>  +  wlandevice_t *wlandev,
>>  +  hfa384x_t *hw,
>>  +  struct p80211msg_dot11req_mibset *msg,
>>  +  void *data)
>>   {
>>   int result;
>>   u32 *uint32 = (u32 *) data;
>>  --
>>  2.1.2
>
> I don't understand the problem you are trying to solve here, what is it?
>
> confused,
>
> greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH] staging: dgap: re-arrange functions for removing forward declarations.

2014-10-13 Thread DaeSeok Youn 
Hi,

2014-10-13 23:56 GMT+09:00 Joe Perches :
> On Mon, 2014-10-13 at 17:01 +0900, DaeSeok Youn wrote:
>> Hi,
>>
>> 2014-10-13 12:25 GMT+09:00 Greg KH :
>> > On Mon, Oct 13, 2014 at 11:34:25AM +0900, Daeseok Youn wrote:
>> >> Re-arrange the functions for removing forward declarations.
>> >>
>> >> Signed-off-by: Daeseok Youn 
>> >> ---
>> >> This patch has too many changes for re-arranging the functions.
>> >> So I wonder that I should break this up into smaller patches.
>> >
>> > Are the .o files identical before and after this patch?  If so, it's
>> > fine.
>> Ok. I will check for that.
>
> The .o files shouldn't be identical after function reordering.
>
Is it possible to sort "objdump -d" output by function name?
I'm not sure but it can be checked after sorting.

I think greg want to know missing functions in this patch because this
has many changes.

thanks.

regards,
Daeseok Youn.
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH] staging: dgap: re-arrange functions for removing forward declarations.

2014-10-13 Thread Greg KH 
On Mon, Oct 13, 2014 at 07:56:38AM -0700, Joe Perches wrote:
> On Mon, 2014-10-13 at 17:01 +0900, DaeSeok Youn wrote:
> > Hi,
> > 
> > 2014-10-13 12:25 GMT+09:00 Greg KH :
> > > On Mon, Oct 13, 2014 at 11:34:25AM +0900, Daeseok Youn wrote:
> > >> Re-arrange the functions for removing forward declarations.
> > >>
> > >> Signed-off-by: Daeseok Youn 
> > >> ---
> > >> This patch has too many changes for re-arranging the functions.
> > >> So I wonder that I should break this up into smaller patches.
> > >
> > > Are the .o files identical before and after this patch?  If so, it's
> > > fine.
> > Ok. I will check for that.
> 
> The .o files shouldn't be identical after function reordering.

Hm, they might be the same size, but I can see how on some
architectures (like ppc) how that would not be the case, you are right.

Isn't there an "objdiff" program or something like that which might help
in validating that nothing "changed" in the source for type of patch
that just moves functions around in a file.

thanks,

greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH] staging: dgap: re-arrange functions for removing forward declarations.

2014-10-13 Thread Joe Perches 
On Tue, 2014-10-14 at 04:04 +0200, Greg KH wrote:
> On Mon, Oct 13, 2014 at 07:56:38AM -0700, Joe Perches wrote:
> > On Mon, 2014-10-13 at 17:01 +0900, DaeSeok Youn wrote:
> > > 2014-10-13 12:25 GMT+09:00 Greg KH :
> > > > On Mon, Oct 13, 2014 at 11:34:25AM +0900, Daeseok Youn wrote:
> > > >> Re-arrange the functions for removing forward declarations.
[]
> > > >> This patch has too many changes for re-arranging the functions.
> > > >> So I wonder that I should break this up into smaller patches.
> > > > Are the .o files identical before and after this patch?  If so, it's
> > > > fine.
> > > Ok. I will check for that.
> > The .o files shouldn't be identical after function reordering.
> 
> Hm, they might be the same size, but I can see how on some
> architectures (like ppc) how that would not be the case, you are right.
> 
> Isn't there an "objdiff" program or something like that which might help
> in validating that nothing "changed" in the source for type of patch
> that just moves functions around in a file.

There is a scripts/objdiff, but that is basically for whitespace
only changes.

I don't know of a way to compare objects when functions are
rearranged in the source file.

Anyone else?

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCHv2] staging: rtl8188eu: Fix coding style space related ERROR problems

2014-10-13 Thread Jia He 
This fixes space related ERROR reports by checkpatch.pl
Generated by $ git ls-files "drivers/staging/rtl8188eu/*.[ch]" | \
  xargs ./scripts/checkpatch.pl -f --fix-inplace --strict --types=SPACING
Already checked by text comparasion
$git diff -w 
and binary comparasion of r8188eu.ko
$objdiff diff  

Signed-off-by: Jia He 
Cc: Greg Kroah-Hartman 
---
 drivers/staging/rtl8188eu/core/rtw_cmd.c  |  2 +-
 drivers/staging/rtl8188eu/core/rtw_ieee80211.c| 16 +-
 drivers/staging/rtl8188eu/core/rtw_mlme.c |  2 +-
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 22 +++---
 drivers/staging/rtl8188eu/core/rtw_pwrctrl.c  |  2 +-
 drivers/staging/rtl8188eu/core/rtw_recv.c | 12 
 drivers/staging/rtl8188eu/core/rtw_security.c | 20 ++---
 drivers/staging/rtl8188eu/core/rtw_sta_mgt.c  |  2 +-
 drivers/staging/rtl8188eu/core/rtw_xmit.c | 10 +++
 drivers/staging/rtl8188eu/hal/bb_cfg.c|  4 +--
 drivers/staging/rtl8188eu/hal/fw.c|  8 ++---
 drivers/staging/rtl8188eu/hal/mac_cfg.c   |  2 +-
 drivers/staging/rtl8188eu/hal/odm.c   |  8 ++---
 drivers/staging/rtl8188eu/hal/odm_HWConfig.c  |  2 +-
 drivers/staging/rtl8188eu/hal/odm_RTL8188E.c  |  2 +-
 drivers/staging/rtl8188eu/hal/phy.c   |  2 +-
 drivers/staging/rtl8188eu/hal/rf.c|  4 +--
 drivers/staging/rtl8188eu/hal/rf_cfg.c|  4 +--
 drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c  |  2 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c|  2 +-
 drivers/staging/rtl8188eu/hal/usb_halinit.c   |  2 +-
 drivers/staging/rtl8188eu/include/ieee80211_ext.h | 20 ++---
 drivers/staging/rtl8188eu/include/odm_debug.h |  2 +-
 drivers/staging/rtl8188eu/include/osdep_service.h |  4 +--
 drivers/staging/rtl8188eu/include/rtw_debug.h |  2 +-
 drivers/staging/rtl8188eu/include/rtw_led.h   |  2 +-
 drivers/staging/rtl8188eu/include/rtw_mlme_ext.h  | 26 
 drivers/staging/rtl8188eu/include/wifi.h  | 36 +++
 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c|  2 +-
 drivers/staging/rtl8188eu/os_dep/os_intfs.c   |  2 +-
 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c  |  4 +--
 drivers/staging/rtl8188eu/os_dep/xmit_linux.c |  2 +-
 32 files changed, 116 insertions(+), 116 deletions(-)

diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c 
b/drivers/staging/rtl8188eu/core/rtw_cmd.c
index 9935e66..7b59a10 100644
--- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
+++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
@@ -638,7 +638,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, u8 
unicast_key)
ether_addr_copy(psetstakey_para->addr, sta->hwaddr);
 
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))
-   psetstakey_para->algorithm = (unsigned char) 
psecuritypriv->dot11PrivacyAlgrthm;
+   psetstakey_para->algorithm = (unsigned 
char)psecuritypriv->dot11PrivacyAlgrthm;
else
GET_ENCRY_ALGO(psecuritypriv, sta, psetstakey_para->algorithm, 
false);
 
diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c 
b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
index 755d3ef..f2c3ca7 100644
--- a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
@@ -159,7 +159,7 @@ u8 *rtw_set_ie
return pbuf + len + 2;
 }
 
-inline u8 *rtw_set_ie_ch_switch (u8 *buf, u32 *buf_len, u8 ch_switch_mode,
+inline u8 *rtw_set_ie_ch_switch(u8 *buf, u32 *buf_len, u8 ch_switch_mode,
u8 new_ch, u8 ch_switch_cnt)
 {
u8 ie_data[3];
@@ -870,7 +870,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, 
uint elen,
if (elen < 4) {
if (show_errors) {
DBG_88E("short vendor specific information element 
ignored (len=%lu)\n",
-   (unsigned long) elen);
+   (unsigned long)elen);
}
return -1;
}
@@ -890,7 +890,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, 
uint elen,
case WME_OUI_TYPE: /* this is a Wi-Fi WME info. element */
if (elen < 5) {
DBG_88E("short WME information element ignored 
(len=%lu)\n",
-   (unsigned long) elen);
+   (unsigned long)elen);
return -1;
}
switch (pos[4]) {
@@ -905,7 +905,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, 
uint elen,
break;
default:
DBG_88E("unknown WME information element 
ignored (subtype=%d len=%lu)\n",
-   pos[4], (unsigned long) elen);
+   pos[4], (unsign

Re: [PATCH 08/44] kernel: Move pm_power_off to common code

2014-10-13 Thread Hirokazu TAKATA 
From: Guenter Roeck 
>  arch/m32r/kernel/process.c |  8 

Acked-by: Hirokazu Takata 

Thank you.

-- takata
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCHv2] staging: rtl8188eu: Fix coding style space related ERROR problems

2014-10-13 Thread Jia He 
 Sorry,seems git ate my one line words after mail subject:
>From v1: suggested by j...@perches.com, fixed some points not checked
or not correctly checked by checkpatch.pl

On Tue, 14 Oct 2014 11:28:32 +0800 from hejia...@gmail.com wrote:
> This fixes space related ERROR reports by checkpatch.pl
> Generated by $ git ls-files "drivers/staging/rtl8188eu/*.[ch]" | \
>   xargs ./scripts/checkpatch.pl -f --fix-inplace --strict --types=SPACING
> Already checked by text comparasion
> $git diff -w 
> and binary comparasion of r8188eu.ko
> $objdiff diff  
>
> Signed-off-by: Jia He 
> Cc: Greg Kroah-Hartman 
> ---
>  drivers/staging/rtl8188eu/core/rtw_cmd.c  |  2 +-
>  drivers/staging/rtl8188eu/core/rtw_ieee80211.c| 16 +-
>  drivers/staging/rtl8188eu/core/rtw_mlme.c |  2 +-
>  drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 22 +++---
>  drivers/staging/rtl8188eu/core/rtw_pwrctrl.c  |  2 +-
>  drivers/staging/rtl8188eu/core/rtw_recv.c | 12 
>  drivers/staging/rtl8188eu/core/rtw_security.c | 20 ++---
>  drivers/staging/rtl8188eu/core/rtw_sta_mgt.c  |  2 +-
>  drivers/staging/rtl8188eu/core/rtw_xmit.c | 10 +++
>  drivers/staging/rtl8188eu/hal/bb_cfg.c|  4 +--
>  drivers/staging/rtl8188eu/hal/fw.c|  8 ++---
>  drivers/staging/rtl8188eu/hal/mac_cfg.c   |  2 +-
>  drivers/staging/rtl8188eu/hal/odm.c   |  8 ++---
>  drivers/staging/rtl8188eu/hal/odm_HWConfig.c  |  2 +-
>  drivers/staging/rtl8188eu/hal/odm_RTL8188E.c  |  2 +-
>  drivers/staging/rtl8188eu/hal/phy.c   |  2 +-
>  drivers/staging/rtl8188eu/hal/rf.c|  4 +--
>  drivers/staging/rtl8188eu/hal/rf_cfg.c|  4 +--
>  drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c  |  2 +-
>  drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c|  2 +-
>  drivers/staging/rtl8188eu/hal/usb_halinit.c   |  2 +-
>  drivers/staging/rtl8188eu/include/ieee80211_ext.h | 20 ++---
>  drivers/staging/rtl8188eu/include/odm_debug.h |  2 +-
>  drivers/staging/rtl8188eu/include/osdep_service.h |  4 +--
>  drivers/staging/rtl8188eu/include/rtw_debug.h |  2 +-
>  drivers/staging/rtl8188eu/include/rtw_led.h   |  2 +-
>  drivers/staging/rtl8188eu/include/rtw_mlme_ext.h  | 26 
>  drivers/staging/rtl8188eu/include/wifi.h  | 36 
> +++
>  drivers/staging/rtl8188eu/os_dep/ioctl_linux.c|  2 +-
>  drivers/staging/rtl8188eu/os_dep/os_intfs.c   |  2 +-
>  drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c  |  4 +--
>  drivers/staging/rtl8188eu/os_dep/xmit_linux.c |  2 +-
>  32 files changed, 116 insertions(+), 116 deletions(-)
>
> diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c 
> b/drivers/staging/rtl8188eu/core/rtw_cmd.c
> index 9935e66..7b59a10 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
> @@ -638,7 +638,7 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, u8 *psta, 
> u8 unicast_key)
>   ether_addr_copy(psetstakey_para->addr, sta->hwaddr);
>  
>   if (check_fwstate(pmlmepriv, WIFI_STATION_STATE))
> - psetstakey_para->algorithm = (unsigned char) 
> psecuritypriv->dot11PrivacyAlgrthm;
> + psetstakey_para->algorithm = (unsigned 
> char)psecuritypriv->dot11PrivacyAlgrthm;
>   else
>   GET_ENCRY_ALGO(psecuritypriv, sta, psetstakey_para->algorithm, 
> false);
>  
> diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c 
> b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
> index 755d3ef..f2c3ca7 100644
> --- a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
> +++ b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
> @@ -159,7 +159,7 @@ u8 *rtw_set_ie
>   return pbuf + len + 2;
>  }
>  
> -inline u8 *rtw_set_ie_ch_switch (u8 *buf, u32 *buf_len, u8 ch_switch_mode,
> +inline u8 *rtw_set_ie_ch_switch(u8 *buf, u32 *buf_len, u8 ch_switch_mode,
>   u8 new_ch, u8 ch_switch_cnt)
>  {
>   u8 ie_data[3];
> @@ -870,7 +870,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, 
> uint elen,
>   if (elen < 4) {
>   if (show_errors) {
>   DBG_88E("short vendor specific information element 
> ignored (len=%lu)\n",
> - (unsigned long) elen);
> + (unsigned long)elen);
>   }
>   return -1;
>   }
> @@ -890,7 +890,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, 
> uint elen,
>   case WME_OUI_TYPE: /* this is a Wi-Fi WME info. element */
>   if (elen < 5) {
>   DBG_88E("short WME information element ignored 
> (len=%lu)\n",
> - (unsigned long) elen);
> + (unsigned long)elen);
>   return -1;
>   }
>   switch (pos[4]) {
> @@ -