[PATCH] staging: sm750fb: fix c99 comments
fixed all checkpatch.pl ERROR: do not use C99 // comments
Any C99 comments used to comment out code are simply removed.
Also some of the errors occur inside '#if 0' blocks which I
might as well fix since checkpatch.pl caught them but the blocks
themselves should probably be cleaned up later.
Signed-off-by: Juston Li
---
drivers/staging/sm750fb/ddk750_chip.c | 11 ++--
drivers/staging/sm750fb/ddk750_dvi.c| 4 +--
drivers/staging/sm750fb/ddk750_help.c | 2 --
drivers/staging/sm750fb/ddk750_sii164.c | 11
drivers/staging/sm750fb/sm750.h | 10 +++
drivers/staging/sm750fb/sm750_accel.c | 49 -
drivers/staging/sm750fb/sm750_accel.h | 2 +-
drivers/staging/sm750fb/sm750_cursor.c | 9 +++---
drivers/staging/sm750fb/sm750_help.h| 28 +++
drivers/staging/sm750fb/sm750_hw.c | 4 +--
drivers/staging/sm750fb/sm750_hw.h | 3 --
11 files changed, 41 insertions(+), 92 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_chip.c
b/drivers/staging/sm750fb/ddk750_chip.c
index 8b47c1b..b2137c8 100644
--- a/drivers/staging/sm750fb/ddk750_chip.c
+++ b/drivers/staging/sm750fb/ddk750_chip.c
@@ -17,7 +17,7 @@ logical_chip_type_t getChipType(void)
char physicalRev;
logical_chip_type_t chip;
- physicalID = devId750;//either 0x718 or 0x750
+ physicalID = devId750; /* either 0x718 or 0x750 /
physicalRev = revId750;
if (physicalID == 0x718)
@@ -257,7 +257,7 @@ int ddk750_initHw(initchip_param_t *pInitParam)
unsigned int ulReg;
#if 0
- //move the code to map regiter function.
+ /* move the code to map regiter function. */
if (getChipType() == SM718) {
/* turn on big endian bit*/
ulReg = PEEK32(0x74);
@@ -487,8 +487,6 @@ unsigned int calcPllValue(unsigned int request_orig,
pll_value_t *pll)
}
}
}
-
- //printk("Finally:
pll->n[%lu],m[%lu],od[%lu],pod[%lu]\n",pll->N,pll->M,pll->OD,pll->POD);
return ret;
}
@@ -580,14 +578,9 @@ pll_value_t *pPLL /* Structure to hold the value
to be set in PLL */
}
/* Restore input frequency from Khz to hz unit */
-//pPLL->inputFreq *= 1000;
ulRequestClk *= 1000;
pPLL->inputFreq = DEFAULT_INPUT_CLOCK; /* Default reference clock */
-/* Output debug information */
- //DDKDEBUGPRINT((DISPLAY_LEVEL, "calcPllValue: Requested Frequency =
%d\n", ulRequestClk));
- //DDKDEBUGPRINT((DISPLAY_LEVEL, "calcPllValue: Input CLK = %dHz, M=%d,
N=%d, OD=%d, POD=%d\n", pPLL->inputFreq, pPLL->M, pPLL->N, pPLL->OD,
pPLL->POD));
-
/* Return actual frequency that the PLL can set */
ret = calcPLL(pPLL);
return ret;
diff --git a/drivers/staging/sm750fb/ddk750_dvi.c
b/drivers/staging/sm750fb/ddk750_dvi.c
index f5932bb..b2bf7e6 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.c
+++ b/drivers/staging/sm750fb/ddk750_dvi.c
@@ -51,7 +51,7 @@ int dviInit(
vsyncEnable, deskewEnable, deskewSetting,
continuousSyncEnable,
pllFilterEnable, pllFilterValue);
}
- return -1;//error
+ return -1; /* error */
}
@@ -66,7 +66,6 @@ unsigned short dviGetVendorID(void)
{
dvi_ctrl_device_t *pCurrentDviCtrl;
-//pCurrentDviCtrl = getDviCtrl();
pCurrentDviCtrl = g_dcftSupportedDviController;
if (pCurrentDviCtrl != (dvi_ctrl_device_t *)0)
return pCurrentDviCtrl->pfnGetVendorId();
@@ -86,7 +85,6 @@ unsigned short dviGetDeviceID(void)
{
dvi_ctrl_device_t *pCurrentDviCtrl;
-//pCurrentDviCtrl = getDviCtrl();
pCurrentDviCtrl = g_dcftSupportedDviController;
if (pCurrentDviCtrl != (dvi_ctrl_device_t *)0)
return pCurrentDviCtrl->pfnGetDeviceId();
diff --git a/drivers/staging/sm750fb/ddk750_help.c
b/drivers/staging/sm750fb/ddk750_help.c
index 647004d..96c18eb 100644
--- a/drivers/staging/sm750fb/ddk750_help.c
+++ b/drivers/staging/sm750fb/ddk750_help.c
@@ -1,5 +1,3 @@
-//#include "ddk750_reg.h"
-//#include "ddk750_chip.h"
#include "ddk750_help.h"
void __iomem * mmio750 = NULL;
diff --git a/drivers/staging/sm750fb/ddk750_sii164.c
b/drivers/staging/sm750fb/ddk750_sii164.c
index 84464c1..b6395b8 100644
--- a/drivers/staging/sm750fb/ddk750_sii164.c
+++ b/drivers/staging/sm750fb/ddk750_sii164.c
@@ -125,10 +125,7 @@ long sii164InitChip(
unsigned char pllFilterValue
)
{
-//unsigned char ucRegIndex, ucRegValue;
-//unsigned char ucDeviceAddress,
unsigned char config;
-//unsigned long delayCount;
/* Initialize the i2c bus */
#ifdef USE_HW_I2C
@@ -141,10 +138,6 @@ long sii164InitChip(
/* Check if SII164 Chip exists */
if ((sii164GetVendorID() == SII164_VENDOR_ID) && (sii164GetDeviceID() ==
SII164_DEVICE_ID))
{
-
-#ifdef DDKDEBUG
-//sii164PrintRegisterValues();
-#endif
/*
* I
[PATCH] staging: vt6655: Boolean tests don't need comparisons
From: Abdul Hussain
This patch removes unwanted true from boolean tests.
Signed-off-by: Abdul Hussain
---
drivers/staging/vt6655/rxtx.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 33c4aa4..534338c 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -1093,7 +1093,7 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned
char byPktType,
if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {/* 802.11g
packet */
if (byFBOption == AUTO_FB_NONE) {
- if (bRTS == true) {/* RTS_need */
+ if (bRTS) {/* RTS_need */
pvRrvTime = (void *)(pbyTxBufferAddr +
wTxBufSize);
pMICHDR = (struct vnt_mic_hdr
*)(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_rts));
pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_rts) + cbMICHDR);
@@ -1115,7 +1115,7 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned
char byPktType,
}
} else {
/* Auto Fall Back */
- if (bRTS == true) {/* RTS_need */
+ if (bRTS) {/* RTS_need */
pvRrvTime = (void *)(pbyTxBufferAddr +
wTxBufSize);
pMICHDR = (struct vnt_mic_hdr *)
(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_rts));
pvRTS = (void *) (pbyTxBufferAddr + wTxBufSize
+ sizeof(struct vnt_rrv_time_rts) + cbMICHDR);
@@ -1138,7 +1138,7 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned
char byPktType,
} else {/* 802.11a/b packet */
if (byFBOption == AUTO_FB_NONE) {
- if (bRTS == true) {
+ if (bRTS) {
pvRrvTime = (void *)(pbyTxBufferAddr +
wTxBufSize);
pMICHDR = (struct vnt_mic_hdr *)
(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_ab));
pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_ab) + cbMICHDR);
@@ -1158,7 +1158,7 @@ s_cbFillTxBufHead(struct vnt_private *pDevice, unsigned
char byPktType,
}
} else {
/* Auto Fall Back */
- if (bRTS == true) { /* RTS_need */
+ if (bRTS) { /* RTS_need */
pvRrvTime = (void *)(pbyTxBufferAddr +
wTxBufSize);
pMICHDR = (struct vnt_mic_hdr *)
(pbyTxBufferAddr + wTxBufSize + sizeof(struct vnt_rrv_time_ab));
pvRTS = (void *)(pbyTxBufferAddr + wTxBufSize +
sizeof(struct vnt_rrv_time_ab) + cbMICHDR);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: wilc1000: remove oswrapper & type file
remove OS Wrapper & Type files. now does not used os wrapper file. type file is included os wrapper file. so delete files and rework include method. Signed-off-by: Dean Lee --- drivers/staging/wilc1000/coreconfigurator.h | 1 - drivers/staging/wilc1000/fifo_buffer.c | 1 - drivers/staging/wilc1000/fifo_buffer.h | 5 +++- drivers/staging/wilc1000/host_interface.c | 1 - drivers/staging/wilc1000/wilc_memory.c | 2 +- drivers/staging/wilc1000/wilc_memory.h | 4 ++- drivers/staging/wilc1000/wilc_msgqueue.c| 2 +- drivers/staging/wilc1000/wilc_msgqueue.h| 5 drivers/staging/wilc1000/wilc_oswrapper.h | 41 - drivers/staging/wilc1000/wilc_sleep.c | 2 +- drivers/staging/wilc1000/wilc_sleep.h | 3 +++ drivers/staging/wilc1000/wilc_strutils.c| 2 +- drivers/staging/wilc1000/wilc_strutils.h| 4 +++ drivers/staging/wilc1000/wilc_timer.c | 2 +- drivers/staging/wilc1000/wilc_timer.h | 3 +++ drivers/staging/wilc1000/wilc_type.h| 34 drivers/staging/wilc1000/wilc_wlan.h| 2 +- drivers/staging/wilc1000/wilc_wlan_if.h | 10 ++- 18 files changed, 37 insertions(+), 87 deletions(-) delete mode 100644 drivers/staging/wilc1000/wilc_oswrapper.h delete mode 100644 drivers/staging/wilc1000/wilc_type.h diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h index 697ceb1..f2f6e64 100644 --- a/drivers/staging/wilc1000/coreconfigurator.h +++ b/drivers/staging/wilc1000/coreconfigurator.h @@ -12,7 +12,6 @@ #ifndef CORECONFIGURATOR_H #define CORECONFIGURATOR_H -#include "wilc_oswrapper.h" #include "wilc_wlan_if.h" /*/ /* Constants */ diff --git a/drivers/staging/wilc1000/fifo_buffer.c b/drivers/staging/wilc1000/fifo_buffer.c index c801406..b6c07cf 100644 --- a/drivers/staging/wilc1000/fifo_buffer.c +++ b/drivers/staging/wilc1000/fifo_buffer.c @@ -1,6 +1,5 @@ -#include "wilc_oswrapper.h" #include "fifo_buffer.h" diff --git a/drivers/staging/wilc1000/fifo_buffer.h b/drivers/staging/wilc1000/fifo_buffer.h index 57f7732..7b76998 100644 --- a/drivers/staging/wilc1000/fifo_buffer.h +++ b/drivers/staging/wilc1000/fifo_buffer.h @@ -1,5 +1,8 @@ -#include "wilc_oswrapper.h" +#include +#include +#include "wilc_memory.h" +#include "wilc_strutils.h" #define tHANDLEvoid * diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index a1e90a5..60245b1 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -1,5 +1,4 @@ #include "host_interface.h" -#include "wilc_oswrapper.h" #include "itypes.h" #include "coreconfigurator.h" diff --git a/drivers/staging/wilc1000/wilc_memory.c b/drivers/staging/wilc1000/wilc_memory.c index 080fa61..ca6850c7 100644 --- a/drivers/staging/wilc1000/wilc_memory.c +++ b/drivers/staging/wilc1000/wilc_memory.c @@ -1,5 +1,5 @@ -#include "wilc_oswrapper.h" +#include "wilc_memory.h" /*! * @authorsyounan diff --git a/drivers/staging/wilc1000/wilc_memory.h b/drivers/staging/wilc1000/wilc_memory.h index 93642d0..a7a80e5 100644 --- a/drivers/staging/wilc1000/wilc_memory.h +++ b/drivers/staging/wilc1000/wilc_memory.h @@ -10,6 +10,9 @@ * @version 1.0 */ +#include +#include + /*! * @struct tstrWILC_MemoryAttrs * @brief Memory API options @@ -234,4 +237,3 @@ void WILC_MemoryFree(const void *pvBlock, tstrWILC_MemoryAttrs *strAttrs, #endif - diff --git a/drivers/staging/wilc1000/wilc_msgqueue.c b/drivers/staging/wilc1000/wilc_msgqueue.c index 04fe5a5..16bcef4 100644 --- a/drivers/staging/wilc1000/wilc_msgqueue.c +++ b/drivers/staging/wilc1000/wilc_msgqueue.c @@ -1,5 +1,5 @@ -#include "wilc_oswrapper.h" +#include "wilc_msgqueue.h" #include /*! diff --git a/drivers/staging/wilc1000/wilc_msgqueue.h b/drivers/staging/wilc1000/wilc_msgqueue.h index 2ca02db..35b1001 100644 --- a/drivers/staging/wilc1000/wilc_msgqueue.h +++ b/drivers/staging/wilc1000/wilc_msgqueue.h @@ -10,6 +10,11 @@ * @version 1.0 */ +#include "wilc_platform.h" +#include "wilc_errorsupport.h" +#include "wilc_memory.h" +#include "wilc_strutils.h" + /*! * @struct tstrWILC_MsgQueueAttrs * @brief Message Queue API options diff --git a/drivers/staging/wilc1000/wilc_oswrapper.h b/drivers/staging/wilc1000/wilc_oswrapper.h deleted file mode 100644 index e97aa96..000 --- a/drivers/staging/wilc1000/wilc_oswrapper.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef __WILC_OSWRAPPER_H__ -#define __WILC_OSWRAPPER_H__ - -/*! - * @file wilc_oswrapper.h - * @brief Top level OS Wrapper, include this file and it will include all - * other files as necessary - * @authorsyounan - * @d
Re: [PATCH 6/6] drivers:pci:hv: New paravirtual PCI front-end for Hyper-V VMs
Greg has already asked you to resend. So here follow a few remarks to
take into account for that resend.
On Thu, 2015-06-11 at 16:22 +, ja...@microsoft.com wrote:
> --- a/drivers/pci/Kconfig
> +++ b/drivers/pci/Kconfig
> +config HYPERV_VPCI
> +tristate "Hyper-V PCI Frontend"
> +depends on PCI && X86 && HYPERV
> +select PCI_HV
That symbol doesn't exist and is not added in this series, right? If so,
scripts/checkkconsymbols.py could have told you that.
> +default y
Are you sure?
> +help
> + The PCI device frontend driver allows the kernel to import
> arbitrary
> + PCI devices from a PCI backend to support PCI driver domains.
> --- /dev/null
> +++ b/drivers/pci/host/hv_pcifront.c
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License version 2 as published
> + * by the Free Software Foundation.
> + *
> + * 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, GOOD TITLE or
> + * NON INFRINGEMENT. See the GNU General Public License for more
This states the license is GPL v2.
> +EXPORT_SYMBOL(hv_read_config_block);
> +EXPORT_SYMBOL(hv_write_config_block);
> +EXPORT_SYMBOL(hv_register_block_invalidate);
I couldn't spot any users of these exports. Actually, I couldn't even
spot any users of these three functions. Why were they added?
> +MODULE_LICENSE("GPL");
This states, according to include/linux/module.h, that the license is
GPL v2 or later. So I think either the comment at the top of this file
or the ident used in the MODULE_LICENSE() macro needs to change.
Thanks,
Paul Bolle
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: wilc1000: remove oswrapper & type file
On 06/12, Dean Lee wrote: > remove OS Wrapper & Type files. > now does not used os wrapper file. > type file is included os wrapper file. > so delete files and rework include method. I do not understand the commit message and it does not parse well. - konrad > > Signed-off-by: Dean Lee > --- > drivers/staging/wilc1000/coreconfigurator.h | 1 - > drivers/staging/wilc1000/fifo_buffer.c | 1 - > drivers/staging/wilc1000/fifo_buffer.h | 5 +++- > drivers/staging/wilc1000/host_interface.c | 1 - > drivers/staging/wilc1000/wilc_memory.c | 2 +- > drivers/staging/wilc1000/wilc_memory.h | 4 ++- > drivers/staging/wilc1000/wilc_msgqueue.c| 2 +- > drivers/staging/wilc1000/wilc_msgqueue.h| 5 > drivers/staging/wilc1000/wilc_oswrapper.h | 41 > - > drivers/staging/wilc1000/wilc_sleep.c | 2 +- > drivers/staging/wilc1000/wilc_sleep.h | 3 +++ > drivers/staging/wilc1000/wilc_strutils.c| 2 +- > drivers/staging/wilc1000/wilc_strutils.h| 4 +++ > drivers/staging/wilc1000/wilc_timer.c | 2 +- > drivers/staging/wilc1000/wilc_timer.h | 3 +++ > drivers/staging/wilc1000/wilc_type.h| 34 > drivers/staging/wilc1000/wilc_wlan.h| 2 +- > drivers/staging/wilc1000/wilc_wlan_if.h | 10 ++- > 18 files changed, 37 insertions(+), 87 deletions(-) > delete mode 100644 drivers/staging/wilc1000/wilc_oswrapper.h > delete mode 100644 drivers/staging/wilc1000/wilc_type.h > > diff --git a/drivers/staging/wilc1000/coreconfigurator.h > b/drivers/staging/wilc1000/coreconfigurator.h > index 697ceb1..f2f6e64 100644 > --- a/drivers/staging/wilc1000/coreconfigurator.h > +++ b/drivers/staging/wilc1000/coreconfigurator.h > @@ -12,7 +12,6 @@ > #ifndef CORECONFIGURATOR_H > #define CORECONFIGURATOR_H > > -#include "wilc_oswrapper.h" > #include "wilc_wlan_if.h" > > /*/ > /* Constants > */ > diff --git a/drivers/staging/wilc1000/fifo_buffer.c > b/drivers/staging/wilc1000/fifo_buffer.c > index c801406..b6c07cf 100644 > --- a/drivers/staging/wilc1000/fifo_buffer.c > +++ b/drivers/staging/wilc1000/fifo_buffer.c > @@ -1,6 +1,5 @@ > > > -#include "wilc_oswrapper.h" > #include "fifo_buffer.h" > > > diff --git a/drivers/staging/wilc1000/fifo_buffer.h > b/drivers/staging/wilc1000/fifo_buffer.h > index 57f7732..7b76998 100644 > --- a/drivers/staging/wilc1000/fifo_buffer.h > +++ b/drivers/staging/wilc1000/fifo_buffer.h > @@ -1,5 +1,8 @@ > > -#include "wilc_oswrapper.h" > +#include > +#include > +#include "wilc_memory.h" > +#include "wilc_strutils.h" > > > #define tHANDLE void * > diff --git a/drivers/staging/wilc1000/host_interface.c > b/drivers/staging/wilc1000/host_interface.c > index a1e90a5..60245b1 100644 > --- a/drivers/staging/wilc1000/host_interface.c > +++ b/drivers/staging/wilc1000/host_interface.c > @@ -1,5 +1,4 @@ > #include "host_interface.h" > -#include "wilc_oswrapper.h" > #include "itypes.h" > #include "coreconfigurator.h" > > diff --git a/drivers/staging/wilc1000/wilc_memory.c > b/drivers/staging/wilc1000/wilc_memory.c > index 080fa61..ca6850c7 100644 > --- a/drivers/staging/wilc1000/wilc_memory.c > +++ b/drivers/staging/wilc1000/wilc_memory.c > @@ -1,5 +1,5 @@ > > -#include "wilc_oswrapper.h" > +#include "wilc_memory.h" > > /*! > * @author syounan > diff --git a/drivers/staging/wilc1000/wilc_memory.h > b/drivers/staging/wilc1000/wilc_memory.h > index 93642d0..a7a80e5 100644 > --- a/drivers/staging/wilc1000/wilc_memory.h > +++ b/drivers/staging/wilc1000/wilc_memory.h > @@ -10,6 +10,9 @@ > * @version 1.0 > */ > > +#include > +#include > + > /*! > * @struct tstrWILC_MemoryAttrs > * @brief Memory API options > @@ -234,4 +237,3 @@ void WILC_MemoryFree(const void *pvBlock, > tstrWILC_MemoryAttrs *strAttrs, > > > #endif > - > diff --git a/drivers/staging/wilc1000/wilc_msgqueue.c > b/drivers/staging/wilc1000/wilc_msgqueue.c > index 04fe5a5..16bcef4 100644 > --- a/drivers/staging/wilc1000/wilc_msgqueue.c > +++ b/drivers/staging/wilc1000/wilc_msgqueue.c > @@ -1,5 +1,5 @@ > > -#include "wilc_oswrapper.h" > +#include "wilc_msgqueue.h" > #include > > /*! > diff --git a/drivers/staging/wilc1000/wilc_msgqueue.h > b/drivers/staging/wilc1000/wilc_msgqueue.h > index 2ca02db..35b1001 100644 > --- a/drivers/staging/wilc1000/wilc_msgqueue.h > +++ b/drivers/staging/wilc1000/wilc_msgqueue.h > @@ -10,6 +10,11 @@ > * @version 1.0 > */ > > +#include "wilc_platform.h" > +#include "wilc_errorsupport.h" > +#include "wilc_memory.h" > +#include "wilc_strutils.h" > + > /*! > * @struct tstrWILC_MsgQueueAttrs > * @brief Message Queue API options > diff --git a/drivers/staging/wilc1000/wilc_oswrapper.h > b/drivers/staging/wilc1000/wilc_o
Re: [PATCH] staging: sm750fb: fix c99 comments
On 06/12, Juston Li wrote:
> fixed all checkpatch.pl ERROR: do not use C99 // comments
>
> Any C99 comments used to comment out code are simply removed.
> Also some of the errors occur inside '#if 0' blocks which I
> might as well fix since checkpatch.pl caught them but the blocks
> themselves should probably be cleaned up later.
>
> Signed-off-by: Juston Li
> ---
> drivers/staging/sm750fb/ddk750_chip.c | 11 ++--
> drivers/staging/sm750fb/ddk750_dvi.c| 4 +--
> drivers/staging/sm750fb/ddk750_help.c | 2 --
> drivers/staging/sm750fb/ddk750_sii164.c | 11
> drivers/staging/sm750fb/sm750.h | 10 +++
> drivers/staging/sm750fb/sm750_accel.c | 49
> -
> drivers/staging/sm750fb/sm750_accel.h | 2 +-
> drivers/staging/sm750fb/sm750_cursor.c | 9 +++---
> drivers/staging/sm750fb/sm750_help.h| 28 +++
> drivers/staging/sm750fb/sm750_hw.c | 4 +--
> drivers/staging/sm750fb/sm750_hw.h | 3 --
> 11 files changed, 41 insertions(+), 92 deletions(-)
>
> diff --git a/drivers/staging/sm750fb/ddk750_chip.c
> b/drivers/staging/sm750fb/ddk750_chip.c
> index 8b47c1b..b2137c8 100644
> --- a/drivers/staging/sm750fb/ddk750_chip.c
> +++ b/drivers/staging/sm750fb/ddk750_chip.c
> @@ -17,7 +17,7 @@ logical_chip_type_t getChipType(void)
> char physicalRev;
> logical_chip_type_t chip;
>
> - physicalID = devId750;//either 0x718 or 0x750
> + physicalID = devId750; /* either 0x718 or 0x750 /
Does the code compile? I'm worried that the above line will produce
error as the comment block is not properly closed.
- konrad
> physicalRev = revId750;
>
> if (physicalID == 0x718)
> @@ -257,7 +257,7 @@ int ddk750_initHw(initchip_param_t *pInitParam)
>
> unsigned int ulReg;
> #if 0
> - //move the code to map regiter function.
> + /* move the code to map regiter function. */
> if (getChipType() == SM718) {
> /* turn on big endian bit*/
> ulReg = PEEK32(0x74);
> @@ -487,8 +487,6 @@ unsigned int calcPllValue(unsigned int request_orig,
> pll_value_t *pll)
> }
> }
> }
> -
> - //printk("Finally:
> pll->n[%lu],m[%lu],od[%lu],pod[%lu]\n",pll->N,pll->M,pll->OD,pll->POD);
> return ret;
> }
>
> @@ -580,14 +578,9 @@ pll_value_t *pPLL /* Structure to hold the
> value to be set in PLL */
> }
>
> /* Restore input frequency from Khz to hz unit */
> -//pPLL->inputFreq *= 1000;
> ulRequestClk *= 1000;
> pPLL->inputFreq = DEFAULT_INPUT_CLOCK; /* Default reference clock */
>
> -/* Output debug information */
> - //DDKDEBUGPRINT((DISPLAY_LEVEL, "calcPllValue: Requested Frequency =
> %d\n", ulRequestClk));
> - //DDKDEBUGPRINT((DISPLAY_LEVEL, "calcPllValue: Input CLK = %dHz, M=%d,
> N=%d, OD=%d, POD=%d\n", pPLL->inputFreq, pPLL->M, pPLL->N, pPLL->OD,
> pPLL->POD));
> -
> /* Return actual frequency that the PLL can set */
> ret = calcPLL(pPLL);
> return ret;
> diff --git a/drivers/staging/sm750fb/ddk750_dvi.c
> b/drivers/staging/sm750fb/ddk750_dvi.c
> index f5932bb..b2bf7e6 100644
> --- a/drivers/staging/sm750fb/ddk750_dvi.c
> +++ b/drivers/staging/sm750fb/ddk750_dvi.c
> @@ -51,7 +51,7 @@ int dviInit(
>vsyncEnable, deskewEnable, deskewSetting,
> continuousSyncEnable,
>pllFilterEnable, pllFilterValue);
> }
> - return -1;//error
> + return -1; /* error */
> }
>
>
> @@ -66,7 +66,6 @@ unsigned short dviGetVendorID(void)
> {
> dvi_ctrl_device_t *pCurrentDviCtrl;
>
> -//pCurrentDviCtrl = getDviCtrl();
> pCurrentDviCtrl = g_dcftSupportedDviController;
> if (pCurrentDviCtrl != (dvi_ctrl_device_t *)0)
> return pCurrentDviCtrl->pfnGetVendorId();
> @@ -86,7 +85,6 @@ unsigned short dviGetDeviceID(void)
> {
> dvi_ctrl_device_t *pCurrentDviCtrl;
>
> -//pCurrentDviCtrl = getDviCtrl();
> pCurrentDviCtrl = g_dcftSupportedDviController;
> if (pCurrentDviCtrl != (dvi_ctrl_device_t *)0)
> return pCurrentDviCtrl->pfnGetDeviceId();
> diff --git a/drivers/staging/sm750fb/ddk750_help.c
> b/drivers/staging/sm750fb/ddk750_help.c
> index 647004d..96c18eb 100644
> --- a/drivers/staging/sm750fb/ddk750_help.c
> +++ b/drivers/staging/sm750fb/ddk750_help.c
> @@ -1,5 +1,3 @@
> -//#include "ddk750_reg.h"
> -//#include "ddk750_chip.h"
> #include "ddk750_help.h"
>
> void __iomem * mmio750 = NULL;
> diff --git a/drivers/staging/sm750fb/ddk750_sii164.c
> b/drivers/staging/sm750fb/ddk750_sii164.c
> index 84464c1..b6395b8 100644
> --- a/drivers/staging/sm750fb/ddk750_sii164.c
> +++ b/drivers/staging/sm750fb/ddk750_sii164.c
> @@ -125,10 +125,7 @@ long sii164InitChip(
> unsigned char pllFilterValue
> )
> {
> -//unsigned char ucRegIndex, ucRegValue;
> -//unsigned char ucDeviceAddress,
> unsigned char config;
> -
Re: [PATCH] staging: wilc1000: remove oswrapper & type file
On 06/12, Dean.lee wrote: > > > On 2015년 06월 12일 18:17, Konrad Zapalowicz wrote: > >On 06/12, Dean Lee wrote: > >>remove OS Wrapper & Type files. > >>now does not used os wrapper file. > >>type file is included os wrapper file. > >>so delete files and rework include method. > >I do not understand the commit message and it does not parse well. > > > > - konrad > Sorry. my english language skill is very poor...:'-( > > remove OS Wrapper function(wilc_oswrapper.h) is in our plan. > i try removed OS Wrapper function and it's done. > and i found wilc_type.h file is does not used it. > so i deleted them and modify #include line in another file. This is better now. Just focus on what has been done [that is do not write 'try'] and send the v2 of this patch with updated commit message. Thanks - konrad > thanks for your comment. > > B.R > > dean > > >>Signed-off-by: Dean Lee > >>--- > >> drivers/staging/wilc1000/coreconfigurator.h | 1 - > >> drivers/staging/wilc1000/fifo_buffer.c | 1 - > >> drivers/staging/wilc1000/fifo_buffer.h | 5 +++- > >> drivers/staging/wilc1000/host_interface.c | 1 - > >> drivers/staging/wilc1000/wilc_memory.c | 2 +- > >> drivers/staging/wilc1000/wilc_memory.h | 4 ++- > >> drivers/staging/wilc1000/wilc_msgqueue.c| 2 +- > >> drivers/staging/wilc1000/wilc_msgqueue.h| 5 > >> drivers/staging/wilc1000/wilc_oswrapper.h | 41 > >> - > >> drivers/staging/wilc1000/wilc_sleep.c | 2 +- > >> drivers/staging/wilc1000/wilc_sleep.h | 3 +++ > >> drivers/staging/wilc1000/wilc_strutils.c| 2 +- > >> drivers/staging/wilc1000/wilc_strutils.h| 4 +++ > >> drivers/staging/wilc1000/wilc_timer.c | 2 +- > >> drivers/staging/wilc1000/wilc_timer.h | 3 +++ > >> drivers/staging/wilc1000/wilc_type.h| 34 > >> drivers/staging/wilc1000/wilc_wlan.h| 2 +- > >> drivers/staging/wilc1000/wilc_wlan_if.h | 10 ++- > >> 18 files changed, 37 insertions(+), 87 deletions(-) > >> delete mode 100644 drivers/staging/wilc1000/wilc_oswrapper.h > >> delete mode 100644 drivers/staging/wilc1000/wilc_type.h > >> > >>diff --git a/drivers/staging/wilc1000/coreconfigurator.h > >>b/drivers/staging/wilc1000/coreconfigurator.h > >>index 697ceb1..f2f6e64 100644 > >>--- a/drivers/staging/wilc1000/coreconfigurator.h > >>+++ b/drivers/staging/wilc1000/coreconfigurator.h > >>@@ -12,7 +12,6 @@ > >> #ifndef CORECONFIGURATOR_H > >> #define CORECONFIGURATOR_H > >>-#include "wilc_oswrapper.h" > >> #include "wilc_wlan_if.h" > >> > >> /*/ > >> /* Constants > >>*/ > >>diff --git a/drivers/staging/wilc1000/fifo_buffer.c > >>b/drivers/staging/wilc1000/fifo_buffer.c > >>index c801406..b6c07cf 100644 > >>--- a/drivers/staging/wilc1000/fifo_buffer.c > >>+++ b/drivers/staging/wilc1000/fifo_buffer.c > >>@@ -1,6 +1,5 @@ > >>-#include "wilc_oswrapper.h" > >> #include "fifo_buffer.h" > >>diff --git a/drivers/staging/wilc1000/fifo_buffer.h > >>b/drivers/staging/wilc1000/fifo_buffer.h > >>index 57f7732..7b76998 100644 > >>--- a/drivers/staging/wilc1000/fifo_buffer.h > >>+++ b/drivers/staging/wilc1000/fifo_buffer.h > >>@@ -1,5 +1,8 @@ > >>-#include "wilc_oswrapper.h" > >>+#include > >>+#include > >>+#include "wilc_memory.h" > >>+#include "wilc_strutils.h" > >> #define tHANDLE void * > >>diff --git a/drivers/staging/wilc1000/host_interface.c > >>b/drivers/staging/wilc1000/host_interface.c > >>index a1e90a5..60245b1 100644 > >>--- a/drivers/staging/wilc1000/host_interface.c > >>+++ b/drivers/staging/wilc1000/host_interface.c > >>@@ -1,5 +1,4 @@ > >> #include "host_interface.h" > >>-#include "wilc_oswrapper.h" > >> #include "itypes.h" > >> #include "coreconfigurator.h" > >>diff --git a/drivers/staging/wilc1000/wilc_memory.c > >>b/drivers/staging/wilc1000/wilc_memory.c > >>index 080fa61..ca6850c7 100644 > >>--- a/drivers/staging/wilc1000/wilc_memory.c > >>+++ b/drivers/staging/wilc1000/wilc_memory.c > >>@@ -1,5 +1,5 @@ > >>-#include "wilc_oswrapper.h" > >>+#include "wilc_memory.h" > >> /*! > >> * @author syounan > >>diff --git a/drivers/staging/wilc1000/wilc_memory.h > >>b/drivers/staging/wilc1000/wilc_memory.h > >>index 93642d0..a7a80e5 100644 > >>--- a/drivers/staging/wilc1000/wilc_memory.h > >>+++ b/drivers/staging/wilc1000/wilc_memory.h > >>@@ -10,6 +10,9 @@ > >> * @version 1.0 > >> */ > >>+#include > >>+#include > >>+ > >> /*! > >> * @struct tstrWILC_MemoryAttrs > >> * @briefMemory API options > >>@@ -234,4 +237,3 @@ void WILC_MemoryFree(const void *pvBlock, > >>tstrWILC_MemoryAttrs *strAttrs, > >> #endif > >>- > >>diff --git a/drivers/staging/wilc1000/wilc_msgqueue.c > >>b/drivers/staging/wilc1000/wilc_msgqueue.c > >>index 04fe5a5..16bcef4 100644 > >>--- a/drivers/st
Re: [PATCH] staging: sm750fb: fix c99 comments
On Fri, Jun 12, 2015 at 2:21 AM, Konrad Zapalowicz wrote: >> diff --git a/drivers/staging/sm750fb/ddk750_chip.c >> b/drivers/staging/sm750fb/ddk750_chip.c >> index 8b47c1b..b2137c8 100644 >> --- a/drivers/staging/sm750fb/ddk750_chip.c >> +++ b/drivers/staging/sm750fb/ddk750_chip.c >> @@ -17,7 +17,7 @@ logical_chip_type_t getChipType(void) >> char physicalRev; >> logical_chip_type_t chip; >> >> - physicalID = devId750;//either 0x718 or 0x750 >> + physicalID = devId750; /* either 0x718 or 0x750 / > > Does the code compile? I'm worried that the above line will produce > error as the comment block is not properly closed. > > - konrad Good catch, can't believe I missed that. I'll fix, actually test compile this time and resend. Regards Juston ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2] staging: wilc1000: remove oswrapper & type file
On 2015년 06월 12일 19:03, Dean Lee wrote:
remove OS Wrapper function(wilc_oswrapper.h) is in our plan.
i try removed OS Wrapper function and it's done.
and i found wilc_type.h file is does not used it.
so i deleted them and modify #include line in another file.
Signed-off-by: Dean Lee
---
Change
modify commit message.
---
drivers/staging/wilc1000/coreconfigurator.h | 1 -
drivers/staging/wilc1000/fifo_buffer.c | 1 -
drivers/staging/wilc1000/fifo_buffer.h | 5 ++-
drivers/staging/wilc1000/host_interface.c | 1 -
drivers/staging/wilc1000/wilc_log.h | 53 -
drivers/staging/wilc1000/wilc_memory.c | 2 +-
drivers/staging/wilc1000/wilc_memory.h | 4 ++-
drivers/staging/wilc1000/wilc_msgqueue.c| 2 +-
drivers/staging/wilc1000/wilc_msgqueue.h| 5 +++
drivers/staging/wilc1000/wilc_oswrapper.h | 41 --
drivers/staging/wilc1000/wilc_sleep.c | 2 +-
drivers/staging/wilc1000/wilc_sleep.h | 3 ++
drivers/staging/wilc1000/wilc_strutils.c| 2 +-
drivers/staging/wilc1000/wilc_strutils.h| 4 +++
drivers/staging/wilc1000/wilc_timer.c | 2 +-
drivers/staging/wilc1000/wilc_timer.h | 3 ++
drivers/staging/wilc1000/wilc_type.h| 34 --
drivers/staging/wilc1000/wilc_wlan.h| 2 +-
drivers/staging/wilc1000/wilc_wlan_if.h | 10 +-
19 files changed, 67 insertions(+), 110 deletions(-)
delete mode 100644 drivers/staging/wilc1000/wilc_oswrapper.h
delete mode 100644 drivers/staging/wilc1000/wilc_type.h
diff --git a/drivers/staging/wilc1000/coreconfigurator.h
b/drivers/staging/wilc1000/coreconfigurator.h
index 697ceb1..f2f6e64 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -12,7 +12,6 @@
#ifndef CORECONFIGURATOR_H
#define CORECONFIGURATOR_H
-#include "wilc_oswrapper.h"
#include "wilc_wlan_if.h"
/*/
/* Constants
*/
diff --git a/drivers/staging/wilc1000/fifo_buffer.c
b/drivers/staging/wilc1000/fifo_buffer.c
index c801406..b6c07cf 100644
--- a/drivers/staging/wilc1000/fifo_buffer.c
+++ b/drivers/staging/wilc1000/fifo_buffer.c
@@ -1,6 +1,5 @@
-#include "wilc_oswrapper.h"
#include "fifo_buffer.h"
diff --git a/drivers/staging/wilc1000/fifo_buffer.h b/drivers/staging/wilc1000/fifo_buffer.h
index 57f7732..7b76998 100644
--- a/drivers/staging/wilc1000/fifo_buffer.h
+++ b/drivers/staging/wilc1000/fifo_buffer.h
@@ -1,5 +1,8 @@
-#include "wilc_oswrapper.h"
+#include
+#include
+#include "wilc_memory.h"
+#include "wilc_strutils.h"
#define tHANDLE void *
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index a1e90a5..60245b1 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1,5 +1,4 @@
#include "host_interface.h"
-#include "wilc_oswrapper.h"
#include "itypes.h"
#include "coreconfigurator.h"
diff --git a/drivers/staging/wilc1000/wilc_log.h b/drivers/staging/wilc1000/wilc_log.h
index 2269ebd..93f467a 100644
--- a/drivers/staging/wilc1000/wilc_log.h
+++ b/drivers/staging/wilc1000/wilc_log.h
@@ -2,46 +2,53 @@
#define __WILC_LOG_H__
/* Errors will always get printed */
-#define WILC_ERROR(...) do { WILC_PRINTF("(ERR)(%s:%d) ", __WILC_FUNCTION__,
__WILC_LINE__); \
- WILC_PRINTF(__VA_ARGS__); \
- } while (0)
+#define WILC_ERROR(...)
\
+do { \
+ WILC_PRINTF("(ERR)(%s:%d)", __WILC_FUNCTION__, __WILC_LINE__);\
+ WILC_PRINTF(__VA_ARGS__); \
+} while (0)
/* Wraning only printed if verbosity is 1 or more */
#if (WILC_LOG_VERBOSITY_LEVEL > 0)
-#define WILC_WARN(...) do { WILC_PRINTF("(WRN)"); \
- WILC_PRINTF(__VA_ARGS__); \
- } while (0)
+#define WILC_WARN(...) \
+do { \
+ WILC_PRINTF("(WRN)"); \
+ WILC_PRINTF(__VA_ARGS__); \
+} while (0)
#else
-#define WILC_WARN(...) (0)
+#define WILC_WARN(...) (0)
#endif
/* Info only printed if verbosity is 2 or more */
#if (WILC_LOG_VERBOSITY_LEVEL > 1)
-#define WILC_INFO(...) do { WILC_PRINTF("(INF)"); \
-WILC_PRINTF(__VA_ARGS__); \
- } while (0)
+#define WILC_INFO(...) \
+do { \
+ WILC_PRINTF("(INF)"); \
+ WILC_PRINTF(__VA_ARGS__); \
+} while (0)
#else
-#define WILC_INFO(..
[PATCH v2] staging: sm750fb: fix c99 comments
fixed all checkpatch.pl ERROR: do not use C99 // comments
Any C99 comments used to comment out code are simply removed.
Also some of the errors occur inside '#if 0' blocks which I
might as well fix since checkpatch.pl caught them but the blocks
themselves should probably be cleaned up later.
Changes since v1: close a comment block
Signed-off-by: Juston Li
---
drivers/staging/sm750fb/ddk750_chip.c | 11 ++--
drivers/staging/sm750fb/ddk750_dvi.c| 4 +--
drivers/staging/sm750fb/ddk750_help.c | 2 --
drivers/staging/sm750fb/ddk750_sii164.c | 11
drivers/staging/sm750fb/sm750.h | 10 +++
drivers/staging/sm750fb/sm750_accel.c | 49 -
drivers/staging/sm750fb/sm750_accel.h | 2 +-
drivers/staging/sm750fb/sm750_cursor.c | 9 +++---
drivers/staging/sm750fb/sm750_help.h| 28 +++
drivers/staging/sm750fb/sm750_hw.c | 4 +--
drivers/staging/sm750fb/sm750_hw.h | 3 --
11 files changed, 41 insertions(+), 92 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_chip.c
b/drivers/staging/sm750fb/ddk750_chip.c
index 8b47c1b..981736f 100644
--- a/drivers/staging/sm750fb/ddk750_chip.c
+++ b/drivers/staging/sm750fb/ddk750_chip.c
@@ -17,7 +17,7 @@ logical_chip_type_t getChipType(void)
char physicalRev;
logical_chip_type_t chip;
- physicalID = devId750;//either 0x718 or 0x750
+ physicalID = devId750; /* either 0x718 or 0x750 */
physicalRev = revId750;
if (physicalID == 0x718)
@@ -257,7 +257,7 @@ int ddk750_initHw(initchip_param_t *pInitParam)
unsigned int ulReg;
#if 0
- //move the code to map regiter function.
+ /* move the code to map regiter function. */
if (getChipType() == SM718) {
/* turn on big endian bit*/
ulReg = PEEK32(0x74);
@@ -487,8 +487,6 @@ unsigned int calcPllValue(unsigned int request_orig,
pll_value_t *pll)
}
}
}
-
- //printk("Finally:
pll->n[%lu],m[%lu],od[%lu],pod[%lu]\n",pll->N,pll->M,pll->OD,pll->POD);
return ret;
}
@@ -580,14 +578,9 @@ pll_value_t *pPLL /* Structure to hold the value
to be set in PLL */
}
/* Restore input frequency from Khz to hz unit */
-//pPLL->inputFreq *= 1000;
ulRequestClk *= 1000;
pPLL->inputFreq = DEFAULT_INPUT_CLOCK; /* Default reference clock */
-/* Output debug information */
- //DDKDEBUGPRINT((DISPLAY_LEVEL, "calcPllValue: Requested Frequency =
%d\n", ulRequestClk));
- //DDKDEBUGPRINT((DISPLAY_LEVEL, "calcPllValue: Input CLK = %dHz, M=%d,
N=%d, OD=%d, POD=%d\n", pPLL->inputFreq, pPLL->M, pPLL->N, pPLL->OD,
pPLL->POD));
-
/* Return actual frequency that the PLL can set */
ret = calcPLL(pPLL);
return ret;
diff --git a/drivers/staging/sm750fb/ddk750_dvi.c
b/drivers/staging/sm750fb/ddk750_dvi.c
index f5932bb..b2bf7e6 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.c
+++ b/drivers/staging/sm750fb/ddk750_dvi.c
@@ -51,7 +51,7 @@ int dviInit(
vsyncEnable, deskewEnable, deskewSetting,
continuousSyncEnable,
pllFilterEnable, pllFilterValue);
}
- return -1;//error
+ return -1; /* error */
}
@@ -66,7 +66,6 @@ unsigned short dviGetVendorID(void)
{
dvi_ctrl_device_t *pCurrentDviCtrl;
-//pCurrentDviCtrl = getDviCtrl();
pCurrentDviCtrl = g_dcftSupportedDviController;
if (pCurrentDviCtrl != (dvi_ctrl_device_t *)0)
return pCurrentDviCtrl->pfnGetVendorId();
@@ -86,7 +85,6 @@ unsigned short dviGetDeviceID(void)
{
dvi_ctrl_device_t *pCurrentDviCtrl;
-//pCurrentDviCtrl = getDviCtrl();
pCurrentDviCtrl = g_dcftSupportedDviController;
if (pCurrentDviCtrl != (dvi_ctrl_device_t *)0)
return pCurrentDviCtrl->pfnGetDeviceId();
diff --git a/drivers/staging/sm750fb/ddk750_help.c
b/drivers/staging/sm750fb/ddk750_help.c
index 647004d..96c18eb 100644
--- a/drivers/staging/sm750fb/ddk750_help.c
+++ b/drivers/staging/sm750fb/ddk750_help.c
@@ -1,5 +1,3 @@
-//#include "ddk750_reg.h"
-//#include "ddk750_chip.h"
#include "ddk750_help.h"
void __iomem * mmio750 = NULL;
diff --git a/drivers/staging/sm750fb/ddk750_sii164.c
b/drivers/staging/sm750fb/ddk750_sii164.c
index 84464c1..b6395b8 100644
--- a/drivers/staging/sm750fb/ddk750_sii164.c
+++ b/drivers/staging/sm750fb/ddk750_sii164.c
@@ -125,10 +125,7 @@ long sii164InitChip(
unsigned char pllFilterValue
)
{
-//unsigned char ucRegIndex, ucRegValue;
-//unsigned char ucDeviceAddress,
unsigned char config;
-//unsigned long delayCount;
/* Initialize the i2c bus */
#ifdef USE_HW_I2C
@@ -141,10 +138,6 @@ long sii164InitChip(
/* Check if SII164 Chip exists */
if ((sii164GetVendorID() == SII164_VENDOR_ID) && (sii164GetDeviceID() ==
SII164_DEVICE_ID))
{
-
-#ifdef DDKDEBUG
-//sii164PrintRegisterVa
[PATCH] staging: wilc1000: remove warnings reported by checkpatch.pl.
Remove the following warnings in the wilc_log.h:
- unnecessary whitespace before a quoted newline
- line over 80 characters
- single statement macros should not use a do {} while (0) loop.
Signed-off-by: Dean Lee
---
drivers/staging/wilc1000/wilc_log.h | 53 +
1 file changed, 30 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_log.h
b/drivers/staging/wilc1000/wilc_log.h
index 2269ebd..93f467a 100644
--- a/drivers/staging/wilc1000/wilc_log.h
+++ b/drivers/staging/wilc1000/wilc_log.h
@@ -2,46 +2,53 @@
#define __WILC_LOG_H__
/* Errors will always get printed */
-#define WILC_ERROR(...) do { WILC_PRINTF("(ERR)(%s:%d) ", __WILC_FUNCTION__,
__WILC_LINE__); \
- WILC_PRINTF(__VA_ARGS__); \
- } while (0)
+#define WILC_ERROR(...)
\
+do { \
+ WILC_PRINTF("(ERR)(%s:%d)", __WILC_FUNCTION__, __WILC_LINE__); \
+ WILC_PRINTF(__VA_ARGS__); \
+} while (0)
/* Wraning only printed if verbosity is 1 or more */
#if (WILC_LOG_VERBOSITY_LEVEL > 0)
-#define WILC_WARN(...) do { WILC_PRINTF("(WRN)"); \
- WILC_PRINTF(__VA_ARGS__); \
- } while (0)
+#define WILC_WARN(...) \
+do { \
+ WILC_PRINTF("(WRN)"); \
+ WILC_PRINTF(__VA_ARGS__); \
+} while (0)
#else
-#define WILC_WARN(...) (0)
+#define WILC_WARN(...) (0)
#endif
/* Info only printed if verbosity is 2 or more */
#if (WILC_LOG_VERBOSITY_LEVEL > 1)
-#define WILC_INFO(...) do { WILC_PRINTF("(INF)"); \
-WILC_PRINTF(__VA_ARGS__); \
- } while (0)
+#define WILC_INFO(...) \
+do { \
+ WILC_PRINTF("(INF)"); \
+ WILC_PRINTF(__VA_ARGS__); \
+} while (0)
#else
-#define WILC_INFO(...) (0)
+#define WILC_INFO(...) (0)
#endif
/* Debug is only printed if verbosity is 3 or more */
#if (WILC_LOG_VERBOSITY_LEVEL > 2)
-#define WILC_DBG(...) do { WILC_PRINTF("(DBG)(%s:%d) ", __WILC_FUNCTION__,
__WILC_LINE__); \
- WILC_PRINTF(__VA_ARGS__); \
- } while (0)
-
+#define WILC_DBG(...) \
+do { \
+ WILC_PRINTF("(DBG)(%s:%d)", __WILC_FUNCTION__, __WILC_LINE__); \
+ WILC_PRINTF(__VA_ARGS__); \
+} while (0)
#else
-#define WILC_DBG(...) (0)
+#define WILC_DBG(...) (0)
#endif
/* Function In/Out is only printed if verbosity is 4 or more */
#if (WILC_LOG_VERBOSITY_LEVEL > 3)
-#define WILC_FN_IN do { WILC_PRINTF("(FIN) (%s:%d) \n", __WILC_FUNCTION__,
__WILC_LINE__); } while (0)
-#define WILC_FN_OUT(ret) do { WILC_PRINTF("(FOUT) (%s:%d) %d.\n",
__WILC_FUNCTION__, __WILC_LINE__, (ret)); } while (0)
+#define WILC_FN_IN \
+ WILC_PRINTF("(FIN)(%s:%d)\n", __WILC_FUNCTION__, __WILC_LINE__)
+#define WILC_FN_OUT(ret) \
+ WILC_PRINTF("(FOUT)(%s:%d)%d\n", __WILC_FUNCTION__, __WILC_LINE__, ret)
#else
-#define WILC_FN_IN (0)
-#define WILC_FN_OUT(ret) (0)
+#define WILC_FN_IN (0)
+#define WILC_FN_OUT(ret) (0)
+#endif
#endif
-
-
-#endif
\ No newline at end of file
--
2.4.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: wilc1000: remove oswrapper & type file
On 2015년 06월 12일 18:17, Konrad Zapalowicz wrote: On 06/12, Dean Lee wrote: remove OS Wrapper & Type files. now does not used os wrapper file. type file is included os wrapper file. so delete files and rework include method. I do not understand the commit message and it does not parse well. - konrad Sorry. my english language skill is very poor...:'-( remove OS Wrapper function(wilc_oswrapper.h) is in our plan. i try removed OS Wrapper function and it's done. and i found wilc_type.h file is does not used it. so i deleted them and modify #include line in another file. thanks for your comment. B.R dean Signed-off-by: Dean Lee --- drivers/staging/wilc1000/coreconfigurator.h | 1 - drivers/staging/wilc1000/fifo_buffer.c | 1 - drivers/staging/wilc1000/fifo_buffer.h | 5 +++- drivers/staging/wilc1000/host_interface.c | 1 - drivers/staging/wilc1000/wilc_memory.c | 2 +- drivers/staging/wilc1000/wilc_memory.h | 4 ++- drivers/staging/wilc1000/wilc_msgqueue.c| 2 +- drivers/staging/wilc1000/wilc_msgqueue.h| 5 drivers/staging/wilc1000/wilc_oswrapper.h | 41 - drivers/staging/wilc1000/wilc_sleep.c | 2 +- drivers/staging/wilc1000/wilc_sleep.h | 3 +++ drivers/staging/wilc1000/wilc_strutils.c| 2 +- drivers/staging/wilc1000/wilc_strutils.h| 4 +++ drivers/staging/wilc1000/wilc_timer.c | 2 +- drivers/staging/wilc1000/wilc_timer.h | 3 +++ drivers/staging/wilc1000/wilc_type.h| 34 drivers/staging/wilc1000/wilc_wlan.h| 2 +- drivers/staging/wilc1000/wilc_wlan_if.h | 10 ++- 18 files changed, 37 insertions(+), 87 deletions(-) delete mode 100644 drivers/staging/wilc1000/wilc_oswrapper.h delete mode 100644 drivers/staging/wilc1000/wilc_type.h diff --git a/drivers/staging/wilc1000/coreconfigurator.h b/drivers/staging/wilc1000/coreconfigurator.h index 697ceb1..f2f6e64 100644 --- a/drivers/staging/wilc1000/coreconfigurator.h +++ b/drivers/staging/wilc1000/coreconfigurator.h @@ -12,7 +12,6 @@ #ifndef CORECONFIGURATOR_H #define CORECONFIGURATOR_H -#include "wilc_oswrapper.h" #include "wilc_wlan_if.h" /*/ /* Constants */ diff --git a/drivers/staging/wilc1000/fifo_buffer.c b/drivers/staging/wilc1000/fifo_buffer.c index c801406..b6c07cf 100644 --- a/drivers/staging/wilc1000/fifo_buffer.c +++ b/drivers/staging/wilc1000/fifo_buffer.c @@ -1,6 +1,5 @@ -#include "wilc_oswrapper.h" #include "fifo_buffer.h" diff --git a/drivers/staging/wilc1000/fifo_buffer.h b/drivers/staging/wilc1000/fifo_buffer.h index 57f7732..7b76998 100644 --- a/drivers/staging/wilc1000/fifo_buffer.h +++ b/drivers/staging/wilc1000/fifo_buffer.h @@ -1,5 +1,8 @@ -#include "wilc_oswrapper.h" +#include +#include +#include "wilc_memory.h" +#include "wilc_strutils.h" #define tHANDLE void * diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index a1e90a5..60245b1 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -1,5 +1,4 @@ #include "host_interface.h" -#include "wilc_oswrapper.h" #include "itypes.h" #include "coreconfigurator.h" diff --git a/drivers/staging/wilc1000/wilc_memory.c b/drivers/staging/wilc1000/wilc_memory.c index 080fa61..ca6850c7 100644 --- a/drivers/staging/wilc1000/wilc_memory.c +++ b/drivers/staging/wilc1000/wilc_memory.c @@ -1,5 +1,5 @@ -#include "wilc_oswrapper.h" +#include "wilc_memory.h" /*! * @author syounan diff --git a/drivers/staging/wilc1000/wilc_memory.h b/drivers/staging/wilc1000/wilc_memory.h index 93642d0..a7a80e5 100644 --- a/drivers/staging/wilc1000/wilc_memory.h +++ b/drivers/staging/wilc1000/wilc_memory.h @@ -10,6 +10,9 @@ * @version 1.0 */ +#include +#include + /*! * @struct tstrWILC_MemoryAttrs * @briefMemory API options @@ -234,4 +237,3 @@ void WILC_MemoryFree(const void *pvBlock, tstrWILC_MemoryAttrs *strAttrs, #endif - diff --git a/drivers/staging/wilc1000/wilc_msgqueue.c b/drivers/staging/wilc1000/wilc_msgqueue.c index 04fe5a5..16bcef4 100644 --- a/drivers/staging/wilc1000/wilc_msgqueue.c +++ b/drivers/staging/wilc1000/wilc_msgqueue.c @@ -1,5 +1,5 @@ -#include "wilc_oswrapper.h" +#include "wilc_msgqueue.h" #include /*! diff --git a/drivers/staging/wilc1000/wilc_msgqueue.h b/drivers/staging/wilc1000/wilc_msgqueue.h index 2ca02db..35b1001 100644 --- a/drivers/staging/wilc1000/wilc_msgqueue.h +++ b/drivers/staging/wilc1000/wilc_msgqueue.h @@ -10,6 +10,11 @@ * @version 1.0 */ +#include "wilc_platform.h" +#include "wilc_errorsupport.h" +#include "wilc_memory.h" +#include "wilc_strutils.h" + /*! * @struct tstrWILC_MsgQueu
[PATCH v3] staging: wilc1000: remove oswrapper & type file
remove OS Wrapper function(wilc_oswrapper.h) is in our plan.
i removed OS Wrapper function and it's done.
and i found wilc_type.h file is does not used it.
so i deleted them and modify #include line in another file.
Signed-off-by: Dean Lee
---
drivers/staging/wilc1000/coreconfigurator.h | 1 -
drivers/staging/wilc1000/fifo_buffer.c | 1 -
drivers/staging/wilc1000/fifo_buffer.h | 5 ++-
drivers/staging/wilc1000/host_interface.c | 1 -
drivers/staging/wilc1000/wilc_log.h | 53 -
drivers/staging/wilc1000/wilc_memory.c | 2 +-
drivers/staging/wilc1000/wilc_memory.h | 4 ++-
drivers/staging/wilc1000/wilc_msgqueue.c| 2 +-
drivers/staging/wilc1000/wilc_msgqueue.h| 5 +++
drivers/staging/wilc1000/wilc_oswrapper.h | 41 --
drivers/staging/wilc1000/wilc_sleep.c | 2 +-
drivers/staging/wilc1000/wilc_sleep.h | 3 ++
drivers/staging/wilc1000/wilc_strutils.c| 2 +-
drivers/staging/wilc1000/wilc_strutils.h| 4 +++
drivers/staging/wilc1000/wilc_timer.c | 2 +-
drivers/staging/wilc1000/wilc_timer.h | 3 ++
drivers/staging/wilc1000/wilc_type.h| 34 --
drivers/staging/wilc1000/wilc_wlan.h| 2 +-
drivers/staging/wilc1000/wilc_wlan_if.h | 10 +-
19 files changed, 67 insertions(+), 110 deletions(-)
delete mode 100644 drivers/staging/wilc1000/wilc_oswrapper.h
delete mode 100644 drivers/staging/wilc1000/wilc_type.h
diff --git a/drivers/staging/wilc1000/coreconfigurator.h
b/drivers/staging/wilc1000/coreconfigurator.h
index 697ceb1..f2f6e64 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -12,7 +12,6 @@
#ifndef CORECONFIGURATOR_H
#define CORECONFIGURATOR_H
-#include "wilc_oswrapper.h"
#include "wilc_wlan_if.h"
/*/
/* Constants */
diff --git a/drivers/staging/wilc1000/fifo_buffer.c
b/drivers/staging/wilc1000/fifo_buffer.c
index c801406..b6c07cf 100644
--- a/drivers/staging/wilc1000/fifo_buffer.c
+++ b/drivers/staging/wilc1000/fifo_buffer.c
@@ -1,6 +1,5 @@
-#include "wilc_oswrapper.h"
#include "fifo_buffer.h"
diff --git a/drivers/staging/wilc1000/fifo_buffer.h
b/drivers/staging/wilc1000/fifo_buffer.h
index 57f7732..7b76998 100644
--- a/drivers/staging/wilc1000/fifo_buffer.h
+++ b/drivers/staging/wilc1000/fifo_buffer.h
@@ -1,5 +1,8 @@
-#include "wilc_oswrapper.h"
+#include
+#include
+#include "wilc_memory.h"
+#include "wilc_strutils.h"
#define tHANDLEvoid *
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index a1e90a5..60245b1 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1,5 +1,4 @@
#include "host_interface.h"
-#include "wilc_oswrapper.h"
#include "itypes.h"
#include "coreconfigurator.h"
diff --git a/drivers/staging/wilc1000/wilc_log.h
b/drivers/staging/wilc1000/wilc_log.h
index 2269ebd..93f467a 100644
--- a/drivers/staging/wilc1000/wilc_log.h
+++ b/drivers/staging/wilc1000/wilc_log.h
@@ -2,46 +2,53 @@
#define __WILC_LOG_H__
/* Errors will always get printed */
-#define WILC_ERROR(...) do { WILC_PRINTF("(ERR)(%s:%d) ", __WILC_FUNCTION__,
__WILC_LINE__); \
- WILC_PRINTF(__VA_ARGS__); \
- } while (0)
+#define WILC_ERROR(...)
\
+do { \
+ WILC_PRINTF("(ERR)(%s:%d)", __WILC_FUNCTION__, __WILC_LINE__); \
+ WILC_PRINTF(__VA_ARGS__); \
+} while (0)
/* Wraning only printed if verbosity is 1 or more */
#if (WILC_LOG_VERBOSITY_LEVEL > 0)
-#define WILC_WARN(...) do { WILC_PRINTF("(WRN)"); \
- WILC_PRINTF(__VA_ARGS__); \
- } while (0)
+#define WILC_WARN(...) \
+do { \
+ WILC_PRINTF("(WRN)"); \
+ WILC_PRINTF(__VA_ARGS__); \
+} while (0)
#else
-#define WILC_WARN(...) (0)
+#define WILC_WARN(...) (0)
#endif
/* Info only printed if verbosity is 2 or more */
#if (WILC_LOG_VERBOSITY_LEVEL > 1)
-#define WILC_INFO(...) do { WILC_PRINTF("(INF)"); \
-WILC_PRINTF(__VA_ARGS__); \
- } while (0)
+#define WILC_INFO(...) \
+do { \
+ WILC_PRINTF("(INF)"); \
+ WILC_PRINTF(__VA_ARGS__); \
+} while (0)
#else
-#define WILC_INFO(...) (0)
+#define WILC_INFO(...) (0)
#endif
/* Debug is only printed if verbosity is 3 or more */
#if (WILC_LOG_VERBOSITY_LEVEL > 2)
-#def
[PATCH v2] staging: wilc1000: remove oswrapper & type file
remove OS Wrapper function(wilc_oswrapper.h) is in our plan.
i try removed OS Wrapper function and it's done.
and i found wilc_type.h file is does not used it.
so i deleted them and modify #include line in another file.
Signed-off-by: Dean Lee
---
Change
modify commit message.
---
drivers/staging/wilc1000/coreconfigurator.h | 1 -
drivers/staging/wilc1000/fifo_buffer.c | 1 -
drivers/staging/wilc1000/fifo_buffer.h | 5 ++-
drivers/staging/wilc1000/host_interface.c | 1 -
drivers/staging/wilc1000/wilc_log.h | 53 -
drivers/staging/wilc1000/wilc_memory.c | 2 +-
drivers/staging/wilc1000/wilc_memory.h | 4 ++-
drivers/staging/wilc1000/wilc_msgqueue.c| 2 +-
drivers/staging/wilc1000/wilc_msgqueue.h| 5 +++
drivers/staging/wilc1000/wilc_oswrapper.h | 41 --
drivers/staging/wilc1000/wilc_sleep.c | 2 +-
drivers/staging/wilc1000/wilc_sleep.h | 3 ++
drivers/staging/wilc1000/wilc_strutils.c| 2 +-
drivers/staging/wilc1000/wilc_strutils.h| 4 +++
drivers/staging/wilc1000/wilc_timer.c | 2 +-
drivers/staging/wilc1000/wilc_timer.h | 3 ++
drivers/staging/wilc1000/wilc_type.h| 34 --
drivers/staging/wilc1000/wilc_wlan.h| 2 +-
drivers/staging/wilc1000/wilc_wlan_if.h | 10 +-
19 files changed, 67 insertions(+), 110 deletions(-)
delete mode 100644 drivers/staging/wilc1000/wilc_oswrapper.h
delete mode 100644 drivers/staging/wilc1000/wilc_type.h
diff --git a/drivers/staging/wilc1000/coreconfigurator.h
b/drivers/staging/wilc1000/coreconfigurator.h
index 697ceb1..f2f6e64 100644
--- a/drivers/staging/wilc1000/coreconfigurator.h
+++ b/drivers/staging/wilc1000/coreconfigurator.h
@@ -12,7 +12,6 @@
#ifndef CORECONFIGURATOR_H
#define CORECONFIGURATOR_H
-#include "wilc_oswrapper.h"
#include "wilc_wlan_if.h"
/*/
/* Constants */
diff --git a/drivers/staging/wilc1000/fifo_buffer.c
b/drivers/staging/wilc1000/fifo_buffer.c
index c801406..b6c07cf 100644
--- a/drivers/staging/wilc1000/fifo_buffer.c
+++ b/drivers/staging/wilc1000/fifo_buffer.c
@@ -1,6 +1,5 @@
-#include "wilc_oswrapper.h"
#include "fifo_buffer.h"
diff --git a/drivers/staging/wilc1000/fifo_buffer.h
b/drivers/staging/wilc1000/fifo_buffer.h
index 57f7732..7b76998 100644
--- a/drivers/staging/wilc1000/fifo_buffer.h
+++ b/drivers/staging/wilc1000/fifo_buffer.h
@@ -1,5 +1,8 @@
-#include "wilc_oswrapper.h"
+#include
+#include
+#include "wilc_memory.h"
+#include "wilc_strutils.h"
#define tHANDLEvoid *
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index a1e90a5..60245b1 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1,5 +1,4 @@
#include "host_interface.h"
-#include "wilc_oswrapper.h"
#include "itypes.h"
#include "coreconfigurator.h"
diff --git a/drivers/staging/wilc1000/wilc_log.h
b/drivers/staging/wilc1000/wilc_log.h
index 2269ebd..93f467a 100644
--- a/drivers/staging/wilc1000/wilc_log.h
+++ b/drivers/staging/wilc1000/wilc_log.h
@@ -2,46 +2,53 @@
#define __WILC_LOG_H__
/* Errors will always get printed */
-#define WILC_ERROR(...) do { WILC_PRINTF("(ERR)(%s:%d) ", __WILC_FUNCTION__,
__WILC_LINE__); \
- WILC_PRINTF(__VA_ARGS__); \
- } while (0)
+#define WILC_ERROR(...)
\
+do { \
+ WILC_PRINTF("(ERR)(%s:%d)", __WILC_FUNCTION__, __WILC_LINE__); \
+ WILC_PRINTF(__VA_ARGS__); \
+} while (0)
/* Wraning only printed if verbosity is 1 or more */
#if (WILC_LOG_VERBOSITY_LEVEL > 0)
-#define WILC_WARN(...) do { WILC_PRINTF("(WRN)"); \
- WILC_PRINTF(__VA_ARGS__); \
- } while (0)
+#define WILC_WARN(...) \
+do { \
+ WILC_PRINTF("(WRN)"); \
+ WILC_PRINTF(__VA_ARGS__); \
+} while (0)
#else
-#define WILC_WARN(...) (0)
+#define WILC_WARN(...) (0)
#endif
/* Info only printed if verbosity is 2 or more */
#if (WILC_LOG_VERBOSITY_LEVEL > 1)
-#define WILC_INFO(...) do { WILC_PRINTF("(INF)"); \
-WILC_PRINTF(__VA_ARGS__); \
- } while (0)
+#define WILC_INFO(...) \
+do { \
+ WILC_PRINTF("(INF)"); \
+ WILC_PRINTF(__VA_ARGS__); \
+} while (0)
#else
-#define WILC_INFO(...) (0)
+#define WILC_INFO(...) (0)
#endif
/* Debug is only printed if verbosity is 3 or more */
#
[PATCH] staging: wilc1000: update TODO list
remove complete OS wrapper functions. Signed-off-by: Dean Lee --- drivers/staging/wilc1000/TODO | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/wilc1000/TODO b/drivers/staging/wilc1000/TODO index 95199d8..e876008 100644 --- a/drivers/staging/wilc1000/TODO +++ b/drivers/staging/wilc1000/TODO @@ -1,6 +1,5 @@ TODO: - remove the defined feature as kernel versions -- remove OS wrapper functions - remove custom debug and tracing functions - rework comments and function headers(also coding style) - replace all semaphores with mutexes or completions -- 2.4.3 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/3] staging: rtl8188eu: remove unused enum and CONFIG
The CONFIGs, the enum and the function declaration was not being
used anywhere.
Signed-off-by: Sudip Mukherjee
---
drivers/staging/rtl8188eu/include/odm.h | 8
drivers/staging/rtl8188eu/include/odm_HWConfig.h | 3 ---
2 files changed, 11 deletions(-)
diff --git a/drivers/staging/rtl8188eu/include/odm.h
b/drivers/staging/rtl8188eu/include/odm.h
index 525eb10..7b83d8c 100644
--- a/drivers/staging/rtl8188eu/include/odm.h
+++ b/drivers/staging/rtl8188eu/include/odm.h
@@ -918,14 +918,6 @@ enum ODM_RF_CONTENT {
odm_radiod_txt = 0x1003
};
-enum odm_bb_config_type {
-CONFIG_BB_PHY_REG,
-CONFIG_BB_AGC_TAB,
-CONFIG_BB_AGC_TAB_2G,
-CONFIG_BB_AGC_TAB_5G,
-CONFIG_BB_PHY_REG_PG,
-};
-
/* Status code */
enum rt_status {
RT_STATUS_SUCCESS,
diff --git a/drivers/staging/rtl8188eu/include/odm_HWConfig.h
b/drivers/staging/rtl8188eu/include/odm_HWConfig.h
index 1de4e63..62a0049 100644
--- a/drivers/staging/rtl8188eu/include/odm_HWConfig.h
+++ b/drivers/staging/rtl8188eu/include/odm_HWConfig.h
@@ -120,7 +120,4 @@ void ODM_MacStatusQuery(struct odm_dm_struct *pDM_Odm,
boolbPacketToSelf,
boolbPacketBeacon);
-enum HAL_STATUS ODM_ConfigBBWithHeaderFile(struct odm_dm_struct *pDM_Odm,
- enum odm_bb_config_type ConfigType);
-
#endif
--
1.8.1.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 3/3] staging: rtl8188eu: remove function which does nothing
The function rtw_mfree_all_stainfo() is just holding the lock,
traversing the list, and then unlocking. It is not doing anything else.
So removed the function and modified the places from where it was called.
Signed-off-by: Sudip Mukherjee
---
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 28
1 file changed, 28 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
b/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
index 19b3a0d..b340e4a 100644
--- a/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
+++ b/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
@@ -143,32 +143,6 @@ inline struct sta_info *rtw_get_stainfo_by_offset(struct
sta_priv *stapriv, int
return (struct sta_info *)(stapriv->pstainfo_buf + offset *
sizeof(struct sta_info));
}
-/* this function is used to free the memory of lock || sema for all stainfos
*/
-static void rtw_mfree_all_stainfo(struct sta_priv *pstapriv)
-{
- struct list_head *plist, *phead;
- struct sta_info *psta = NULL;
-
-
- spin_lock_bh(&pstapriv->sta_hash_lock);
-
- phead = get_list_head(&pstapriv->free_sta_queue);
- plist = phead->next;
-
- while (phead != plist) {
- psta = container_of(plist, struct sta_info, list);
- plist = plist->next;
- }
-
- spin_unlock_bh(&pstapriv->sta_hash_lock);
-
-}
-
-static void rtw_mfree_sta_priv_lock(struct sta_priv *pstapriv)
-{
-rtw_mfree_all_stainfo(pstapriv); /* be done before free sta_hash_lock
*/
-}
-
u32_rtw_free_sta_priv(struct sta_priv *pstapriv)
{
struct list_head *phead, *plist;
@@ -197,8 +171,6 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)
spin_unlock_bh(&pstapriv->sta_hash_lock);
/*===*/
- rtw_mfree_sta_priv_lock(pstapriv);
-
if (pstapriv->pallocated_stainfo_buf)
vfree(pstapriv->pallocated_stainfo_buf);
}
--
1.8.1.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/3] staging: rtl8188eu: remove unused variables
These variables were being set but not used afterwards.
Signed-off-by: Sudip Mukherjee
---
drivers/staging/rtl8188eu/core/rtw_mlme.c| 3 ---
drivers/staging/rtl8188eu/hal/phy.c | 10 ++
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 2 --
drivers/staging/rtl8188eu/os_dep/osdep_service.c | 3 +--
4 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c
b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index a0f9f9e..0558451 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -638,7 +638,6 @@ exit:
void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
{
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
- struct mlme_ext_priv *pmlmeext;
spin_lock_bh(&pmlmepriv->lock);
@@ -720,8 +719,6 @@ void rtw_surveydone_event_callback(struct adapter
*adapter, u8 *pbuf)
spin_unlock_bh(&pmlmepriv->lock);
rtw_os_xmit_schedule(adapter);
-
- pmlmeext = &adapter->mlmeextpriv;
}
void rtw_dummy_event_callback(struct adapter *adapter, u8 *pbuf)
diff --git a/drivers/staging/rtl8188eu/hal/phy.c
b/drivers/staging/rtl8188eu/hal/phy.c
index 6e4c3ee..2eafa50 100644
--- a/drivers/staging/rtl8188eu/hal/phy.c
+++ b/drivers/staging/rtl8188eu/hal/phy.c
@@ -629,7 +629,7 @@ void
rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt)
static u8 phy_path_a_iqk(struct adapter *adapt, bool config_pathb)
{
- u32 reg_eac, reg_e94, reg_e9c, reg_ea4;
+ u32 reg_eac, reg_e94, reg_e9c;
u8 result = 0x00;
/* 1 Tx IQK */
@@ -651,7 +651,6 @@ static u8 phy_path_a_iqk(struct adapter *adapt, bool
config_pathb)
reg_eac = phy_query_bb_reg(adapt, rRx_Power_After_IQK_A_2, bMaskDWord);
reg_e94 = phy_query_bb_reg(adapt, rTx_Power_Before_IQK_A, bMaskDWord);
reg_e9c = phy_query_bb_reg(adapt, rTx_Power_After_IQK_A, bMaskDWord);
- reg_ea4 = phy_query_bb_reg(adapt, rRx_Power_Before_IQK_A_2, bMaskDWord);
if (!(reg_eac & BIT28) &&
(((reg_e94 & 0x03FF)>>16) != 0x142) &&
@@ -1316,8 +1315,7 @@ void rtl88eu_phy_iq_calibrate(struct adapter *adapt, bool
recovery)
s32 result[4][8];
u8 i, final, chn_index;
bool pathaok, pathbok;
- s32 reg_e94, reg_e9c, reg_ea4, reg_eac, reg_eb4, reg_ebc, reg_ec4,
- reg_ecc;
+ s32 reg_e94, reg_e9c, reg_ea4, reg_eb4, reg_ebc, reg_ec4;
bool is12simular, is13simular, is23simular;
bool singletone = false, carrier_sup = false;
u32 iqk_bb_reg_92c[IQK_BB_REG_NUM] = {
@@ -1389,18 +1387,15 @@ void rtl88eu_phy_iq_calibrate(struct adapter *adapt,
bool recovery)
reg_e94 = result[i][0];
reg_e9c = result[i][1];
reg_ea4 = result[i][2];
- reg_eac = result[i][3];
reg_eb4 = result[i][4];
reg_ebc = result[i][5];
reg_ec4 = result[i][6];
- reg_ecc = result[i][7];
}
if (final != 0xff) {
reg_e94 = result[final][0];
reg_e9c = result[final][1];
reg_ea4 = result[final][2];
- reg_eac = result[final][3];
reg_eb4 = result[final][4];
reg_ebc = result[final][5];
dm_odm->RFCalibrateInfo.RegE94 = reg_e94;
@@ -1408,7 +1403,6 @@ void rtl88eu_phy_iq_calibrate(struct adapter *adapt, bool
recovery)
dm_odm->RFCalibrateInfo.RegEB4 = reg_eb4;
dm_odm->RFCalibrateInfo.RegEBC = reg_ebc;
reg_ec4 = result[final][6];
- reg_ecc = result[final][7];
pathaok = true;
pathbok = true;
} else {
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
index 0156621..fca5909 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
@@ -151,7 +151,6 @@ void rtl8188e_InitHalDm(struct adapter *Adapter)
void rtl8188e_HalDmWatchDog(struct adapter *Adapter)
{
- bool fw_cur_in_ps = false;
bool fw_ps_awake = true;
u8 hw_init_completed = false;
struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter);
@@ -163,7 +162,6 @@ void rtl8188e_HalDmWatchDog(struct adapter *Adapter)
if (!hw_init_completed)
goto skip_dm;
- fw_cur_in_ps = Adapter->pwrctrlpriv.bFwCurrentInPSMode;
rtw_hal_get_hwreg(Adapter, HW_VAR_FWLPS_RF_ON, (u8 *)(&fw_ps_awake));
/* Fw is under p2p powersaving mode, driver should stop dynamic
mechanism. */
diff --git a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
index abcb3a8..acb4eb1 100644
--- a/drivers/staging/rtl8188eu/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8188eu/os_dep/osdep_service.c
@@ -134,7 +134,7 @@ void rtw_buf_
Re: [PATCH] staging: wilc1000: update TODO list
On Fri, Jun 12, 2015 at 07:23:11PM +0900, Dean Lee wrote: > remove complete OS wrapper functions. just a minor thing. It will be easy if you send your patches in series instead of separate patches. your patch "remove oswrapper & type file" is dependent on one of the previous patch that you have sent today. If for some reason that previous patch is not applied then "remove oswrapper & type file" will not apply and then this patch will have no meaning. regards sudip ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: wilc1000: pass gpio irq number using DT
On Thu, Jun 11, 2015 at 09:15:13AM -0700, Greg Kroah-Hartman wrote: > On Thu, Jun 11, 2015 at 02:22:33PM +, Ravindran, Madhusudhanan (M.) wrote: > > From: Madhusudhanan Ravindran > > > > pass wlan irq gpio number in run time using DT as > > mentioned in the TODO list. > > > > Signed-off-by: Madhusudhanan Ravindran > > -- > > * did not test this code on real hardware. > > I need this tested before I can accept something like this, sorry. > > You have to modify the DT file before this can work properly. Yes, I may not have chance to test so I will drop this. > > Also, one complaint: > > > +unsigned int gpio_num = 0; > > That's a _VERY_ generic global variable name you just created, please > don't do that. I think I should have put them in an existing structure with reasonable name, I will make sure that next time. > > thanks, > Thanks for your review. Madhu. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: wilc1000: remove warnings reported by checkpatch.pl.
On Fri, Jun 12, 2015 at 06:51:56PM +0900, Dean Lee wrote:
> Remove the following warnings in the wilc_log.h:
> - unnecessary whitespace before a quoted newline
> - line over 80 characters
> - single statement macros should not use a do {} while (0) loop.
Those are different things, so this should be broken up into different
patches. Please make this a series of patches, each one only doing one
type of thing.
thanks,
greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
RE: [PATCH 6/6] drivers:pci:hv: New paravirtual PCI front-end for Hyper-V VMs
> -Original Message- > From: Paul Bolle [mailto:pebo...@tiscali.nl] > Sent: Friday, June 12, 2015 1:44 AM > To: Jake Oshins > Cc: gre...@linuxfoundation.org; KY Srinivasan; linux- > ker...@vger.kernel.org; de...@linuxdriverproject.org; o...@aepfle.de; > a...@canonical.com; vkuzn...@redhat.com; linux-...@vger.kernel.org; > bhelg...@google.com; Mike Ebersol; Haiyang Zhang > Subject: Re: [PATCH 6/6] drivers:pci:hv: New paravirtual PCI front-end for > Hyper-V VMs > > Greg has already asked you to resend. So here follow a few remarks to > take into account for that resend. > Thank you. I'll fix everything you've mentioned before resending. I do have one more question, below. > > > +EXPORT_SYMBOL(hv_read_config_block); > > > +EXPORT_SYMBOL(hv_write_config_block); > > > +EXPORT_SYMBOL(hv_register_block_invalidate); > > I couldn't spot any users of these exports. Actually, I couldn't even > spot any users of these three functions. Why were they added? > This driver is intended to support both full PCI Express device pass through and also be the basis for SR-IOV networking on top of Hyper-V. These functions would allow somebody trying to make their NIC driver work on top of Hyper-V to exchange messages with their back-end Windows driver. My question is this. How does somebody delivering a platform usually work with the Linux community to deliver enablement code like this? I'm trying to work in the open, and go upstream early (or at least I think that understand what these things mean.) If the community doesn't want functions that have no callers (and I understand that, too) then how should I provide them to the NIC vendors? Thanks, Jake Oshins ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v3] staging: wilc1000: remove oswrapper & type file
On Fri, Jun 12, 2015 at 07:21:11PM +0900, Dean Lee wrote:
> remove OS Wrapper function(wilc_oswrapper.h) is in our plan.
> i removed OS Wrapper function and it's done.
> and i found wilc_type.h file is does not used it.
> so i deleted them and modify #include line in another file.
You are also doing other things here that you don't describe:
> /* Errors will always get printed */
> -#define WILC_ERROR(...) do { WILC_PRINTF("(ERR)(%s:%d) ",
> __WILC_FUNCTION__, __WILC_LINE__); \
> - WILC_PRINTF(__VA_ARGS__); \
> - } while (0)
> +#define WILC_ERROR(...)
> \
> +do { \
> + WILC_PRINTF("(ERR)(%s:%d)", __WILC_FUNCTION__, __WILC_LINE__); \
> + WILC_PRINTF(__VA_ARGS__); \
> +} while (0)
You reformatted this.
> #if (WILC_LOG_VERBOSITY_LEVEL > 3)
> -#define WILC_FN_IN do { WILC_PRINTF("(FIN) (%s:%d) \n", __WILC_FUNCTION__,
> __WILC_LINE__); } while (0)
> -#define WILC_FN_OUT(ret) do { WILC_PRINTF("(FOUT) (%s:%d) %d.\n",
> __WILC_FUNCTION__, __WILC_LINE__, (ret)); } while (0)
> +#define WILC_FN_IN \
> + WILC_PRINTF("(FIN)(%s:%d)\n", __WILC_FUNCTION__, __WILC_LINE__)
> +#define WILC_FN_OUT(ret) \
> + WILC_PRINTF("(FOUT)(%s:%d)%d\n", __WILC_FUNCTION__, __WILC_LINE__, ret)
And changed this for no obvious reason.
Please, only do one thing per patch. Break this up into logical steps
and resend it as a series of patches, with the last one being the TODO
file item removal.
thanks,
greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: wilc1000: update TODO list
On Fri, Jun 12, 2015 at 07:23:11PM +0900, Dean Lee wrote: > remove complete OS wrapper functions. > > Signed-off-by: Dean Lee > --- > drivers/staging/wilc1000/TODO | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/staging/wilc1000/TODO b/drivers/staging/wilc1000/TODO > index 95199d8..e876008 100644 > --- a/drivers/staging/wilc1000/TODO > +++ b/drivers/staging/wilc1000/TODO > @@ -1,6 +1,5 @@ > TODO: > - remove the defined feature as kernel versions > -- remove OS wrapper functions > - remove custom debug and tracing functions > - rework comments and function headers(also coding style) > - replace all semaphores with mutexes or completions > -- > 2.4.3 This isn't done yet, please make it the last patch in your series. And are you sure you have removed them all? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: wilc1000: change WILC_Char to s8
On Fri, Jun 12, 2015 at 02:39:08PM +0900, Dean Lee wrote: > change own data type(WILC_Char) to common data type(s8) Why not just 'char'? And you are using these in "strings", so why not u8? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: ste_rmi4: Add IRQF_ONESHOT flag
On Fri, Jun 12, 2015 at 06:47:25AM +, Abdul, Hussain (H.) wrote:
> On Thursday 11 June 2015 08:06 PM, gre...@linuxfoundation.org wrote:
> > On Thu, Jun 11, 2015 at 10:14:49AM +, Abdul, Hussain (H.) wrote:
> >> This patch add IRQF_ONESHOT flag in threaded IRQs request without a
> >> primary handler.
> >>
> >> Signed-off-by: Abdul Hussain
> >> ---
> >> drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 2 +-
> >> 1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
> >> b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
> >> index 0f524bb..7caaae0 100644
> >> --- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
> >> +++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
> >> @@ -987,7 +987,7 @@ static int synaptics_rmi4_probe
> >>rmi4_data->number_of_interrupt_register);
> >>retval = request_threaded_irq(client->irq, NULL,
> >>synaptics_rmi4_irq,
> >> - platformdata->irq_type,
> >> + platformdata->irq_type | IRQF_ONESHOT,
> >>DRIVER_NAME, rmi4_data);
> >>if (retval) {
> >>dev_err(&client->dev, "Unable to get attn irq %d\n",
> > Have you tested this? This changes the behavior of the code, right?
> >
> Greg,
>
> I haven't tested this changes. Yes, this will change the behavior of the code.
Then I can't accept this, sorry. Why would you make a behavior change
without testing something?
greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: comedi: cb_pcimdas: fix handlers for DI and DO subdevices
Normally, low-level Comedi drivers set an `insn_bits` handler for
digital input (DI), digital output (DO) and digital input/output (DIO)
subdevice types to handle normal reading and writing of digital
channels. The "cb_pcimdas" driver currently has an `insn_read` handler
for the DI subdevice and an `insn_write` handler for the DO subdevice.
However, the actual handler functions `cb_pcimdas_di_insn_read()` and
`cb_pcimdas_do_insn_write()` are written to behave like `insn_bits`
handlers. Something's wrong there! To fix it, set the functions as
`insn_bits` handlers and rename them for consistency.
Fixes: e56d03dee14a ("staging: comedi: cb_pcimdas: add main connector digital
input/output")
Signed-off-by: Ian Abbott
---
I left the "Fixes:" line non-line-wrapped. Is that the correct thing to
do?
---
drivers/staging/comedi/drivers/cb_pcimdas.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c
b/drivers/staging/comedi/drivers/cb_pcimdas.c
index c458e50..4ebf5aa 100644
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -243,7 +243,7 @@ static int cb_pcimdas_ao_insn_write(struct comedi_device
*dev,
return insn->n;
}
-static int cb_pcimdas_di_insn_read(struct comedi_device *dev,
+static int cb_pcimdas_di_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
@@ -258,7 +258,7 @@ static int cb_pcimdas_di_insn_read(struct comedi_device
*dev,
return insn->n;
}
-static int cb_pcimdas_do_insn_write(struct comedi_device *dev,
+static int cb_pcimdas_do_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
@@ -424,7 +424,7 @@ static int cb_pcimdas_auto_attach(struct comedi_device *dev,
s->n_chan = 4;
s->maxdata = 1;
s->range_table = &range_digital;
- s->insn_read= cb_pcimdas_di_insn_read;
+ s->insn_bits= cb_pcimdas_di_insn_bits;
/* Digital Output subdevice (main connector) */
s = &dev->subdevices[4];
@@ -433,7 +433,7 @@ static int cb_pcimdas_auto_attach(struct comedi_device *dev,
s->n_chan = 4;
s->maxdata = 1;
s->range_table = &range_digital;
- s->insn_write = cb_pcimdas_do_insn_write;
+ s->insn_bits= cb_pcimdas_do_insn_bits;
/* Counter subdevice (8254) */
s = &dev->subdevices[5];
--
2.1.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
RE: [HPDD-discuss] [PATCH 1/1] staging: lustre/lustre/llite: get rid of incorrect type warning
>>On Wed, Jun 10, 2015 at 5:48 PM, Greg Kroah-Hartman > wrote: >> >> Are you sure all of these are correct? The kernel/user api for lustre >> is a complex beast, and just casting away the pointer types isn't >> usually the proper thing to do in order to resolve the issues here. >> >> thanks, >> >> greg k-h > >I'm not 100% sure, but the pointers that I added the annotation to end >up being used as user memory. (eg. passed to copy_to_user, etc.) >Sometimes these pointers are passed to functions that already have >__user annotation in their signatures (eg. ll_getname, copy_and_ioctl, >ll_fid2path, etc.). Using these simple cast are not the proper fix. We had a lot of issues with user land tools breaking due to leakage of kernel space stuff and other problems. Some work went into cleaning that up in the OpenSFS branch but it is not totally complete yet. Evans you wanted something challenging to work on well this is up your alley. I would recommend looking at JIRA ticket LU-6401 and all its sub tickets. You could start the port of those to the upstream client. At the same time we can finish the cleanup in the OpenSFS branch as well. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 6/6] drivers:pci:hv: New paravirtual PCI front-end for Hyper-V VMs
On Fri, Jun 12, 2015 at 03:11:14PM +, Jake Oshins wrote: > This driver is intended to support both full PCI Express device pass through > and also be the basis for SR-IOV networking on top of Hyper-V. These > functions would allow somebody trying to make their NIC driver work on top of > Hyper-V to exchange messages with their back-end Windows driver. > > My question is this. How does somebody delivering a platform usually work > with the Linux community to deliver enablement code like this? I'm trying to > work in the open, and go upstream early (or at least I think that understand > what these things mean.) If the community doesn't want functions that have > no callers (and I understand that, too) then how should I provide them to the > NIC vendors? You add the functions in a patch series along with the NIC driver that uses it. We don't add functions with no callers, sorry. hope this helps, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/3] staging: unisys: Don't hold device responses until driver loads
From: David Kershner
Currently if a driver is not loaded for a device, we will not
respond to the device create until it is done. This causes
s-Par to not mark the partition running if the driver for the
device is not loaded. Since there are several devices that
could be assigned to a guest that don't have an actual
driver this will cause us to never go running.
If the device driver is loaded, we WILL continue to only
respond to the device PAUSE message when the device driver
has responded that it is done with the device.
Signed-off-by: David Kershner
Signed-off-by: Benjamin Romer
---
drivers/staging/unisys/visorbus/visorbus_main.c | 28 +++--
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c
b/drivers/staging/unisys/visorbus/visorbus_main.c
index dcce1f0..ce35e85 100644
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -70,7 +70,6 @@ static const struct attribute_group *visorbus_bus_groups[] = {
NULL,
};
-
/** This describes the TYPE of bus.
* (Don't confuse this with an INSTANCE of the bus.)
*/
@@ -745,19 +744,6 @@ visordriver_probe_device(struct device *xdev)
away:
if (rc != 0)
put_device(&dev->device);
- /* We could get here more than once if the child driver module is
-* unloaded and re-loaded while devices are present. That's why we
-* need a flag to be sure that we only respond to the device_create
-* once. We cannot respond to the device_create prior to here,
-* because until we call drv->probe() above, the channel has not been
-* initialized.
-*/
- if (!dev->responded_to_device_create) {
-
- dev->responded_to_device_create = true;
- if (chipset_responders.device_create)
- (*chipset_responders.device_create)(dev, rc);
- }
return rc;
}
@@ -1306,15 +1292,15 @@ chipset_device_create(struct visor_device *dev_info)
POSTCODE_SEVERITY_INFO);
rc = create_visor_device(dev_info);
- if (rc < 0) {
+ if (chipset_responders.device_create)
+ (*chipset_responders.device_create)(dev_info, rc);
+
+ if (rc < 0)
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
POSTCODE_SEVERITY_ERR);
- if (chipset_responders.device_create)
- (*chipset_responders.device_create)(dev_info, rc);
- }
-
- POSTCODE_LINUX_4(DEVICE_CREATE_SUCCESS_PC, dev_no, bus_no,
-POSTCODE_SEVERITY_INFO);
+ else
+ POSTCODE_LINUX_4(DEVICE_CREATE_SUCCESS_PC, dev_no, bus_no,
+POSTCODE_SEVERITY_INFO);
}
static void
--
2.1.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/3] staging: unisys: Move phys_info to iochannel.h
From: David Kershner
This moves phys_info to iochannel.h. It is only
used by iochannel.h and is not needed in
vmcallinterfaces.h.
Signed-off-by: David Kershner
Signed-off-by: Benjamin Romer
---
drivers/staging/unisys/include/iochannel.h| 7 +++
drivers/staging/unisys/visorbus/vmcallinterface.h | 12
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/unisys/include/iochannel.h
b/drivers/staging/unisys/include/iochannel.h
index cbb5875..db7b332 100644
--- a/drivers/staging/unisys/include/iochannel.h
+++ b/drivers/staging/unisys/include/iochannel.h
@@ -149,6 +149,13 @@ enum vdisk_mgmt_types {
/* structs with pragma pack */
+#pragma pack(push, 1)
+struct phys_info {
+ u64 pi_pfn;
+ u16 pi_off;
+ u16 pi_len;
+};
+#pragma pack(pop)
/* / BEGIN PRAGMA PACK PUSH 1 / */
/* / ONLY STRUCT TYPE SHOULD BE BELOW */
diff --git a/drivers/staging/unisys/visorbus/vmcallinterface.h
b/drivers/staging/unisys/visorbus/vmcallinterface.h
index dc09caf..7a53df0 100644
--- a/drivers/staging/unisys/visorbus/vmcallinterface.h
+++ b/drivers/staging/unisys/visorbus/vmcallinterface.h
@@ -94,18 +94,6 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL
identification tuples */
/* / BEGIN PRAGMA PACK PUSH 1 / */
/* / ONLY STRUCT TYPE SHOULD BE BELOW */
#pragma pack(push, 1)
-struct phys_info {
- u64 pi_pfn;
- u16 pi_off;
- u16 pi_len;
-};
-
-#pragma pack(pop)
-/* / END PRAGMA PACK PUSH 1 /// */
-
-/* / BEGIN PRAGMA PACK PUSH 1 / */
-/* / ONLY STRUCT TYPE SHOULD BE BELOW */
-#pragma pack(push, 1)
/* Parameters to VMCALL_IO_CONTROLVM_ADDR interface */
struct vmcall_io_controlvm_addr_params {
/* The Guest-relative physical address of the ControlVm channel.
--
2.1.4
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 0/3] staging: unisys: visorbus fixes
This series contains fixes for problems found while testing visorbus. David Kershner (3): staging: unisys: Move phys_info to iochannel.h staging: unisys: convert pack pragma to __packed staging: unisys: Don't hold device responses until driver loads drivers/staging/unisys/include/iochannel.h| 46 --- drivers/staging/unisys/visorbus/visorbus_main.c | 28 -- drivers/staging/unisys/visorbus/vmcallinterface.h | 12 -- 3 files changed, 31 insertions(+), 55 deletions(-) -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/3] staging: unisys: convert pack pragma to __packed
From: David Kershner
It was noticed that iochannel.h was still using pragmas to
pack the datastructures, should be using __packed instead.
Signed-off-by: David Kershner
Signed-off-by: Benjamin Romer
---
drivers/staging/unisys/include/iochannel.h | 45 +-
1 file changed, 20 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/unisys/include/iochannel.h
b/drivers/staging/unisys/include/iochannel.h
index db7b332..1517496 100644
--- a/drivers/staging/unisys/include/iochannel.h
+++ b/drivers/staging/unisys/include/iochannel.h
@@ -1,4 +1,5 @@
/* Copyright (C) 2010 - 2013 UNISYS CORPORATION */
+
/* All rights reserved. */
#ifndef __IOCHANNEL_H__
#define __IOCHANNEL_H__
@@ -149,22 +150,18 @@ enum vdisk_mgmt_types {
/* structs with pragma pack */
-#pragma pack(push, 1)
struct phys_info {
u64 pi_pfn;
u16 pi_off;
u16 pi_len;
-};
-#pragma pack(pop)
+} __packed;
/* / BEGIN PRAGMA PACK PUSH 1 / */
/* / ONLY STRUCT TYPE SHOULD BE BELOW */
-#pragma pack(push, 1)
-
struct guest_phys_info {
u64 address;
u64 length;
-};
+} __packed;
#define GPI_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof(struct guest_phys_info))
@@ -172,12 +169,12 @@ struct uisscsi_dest {
u32 channel;/* channel == bus number */
u32 id; /* id == target number */
u32 lun;/* lun == logical unit number */
-};
+} __packed;
struct vhba_wwnn {
u32 wwnn1;
u32 wwnn2;
-};
+} __packed;
/* WARNING: Values stired in this structure must contain maximum counts (not
* maximum values). */
@@ -194,7 +191,7 @@ struct vhba_config_max {/* 20 bytes */
* bus */
/* max io size is often determined by the resource of the hba. e.g */
/* max scatter gather list length * page size / sector size */
-};
+} __packed;
struct uiscmdrsp_scsi {
void *scsicmd; /* the handle to the cmd that was received -
@@ -233,7 +230,7 @@ struct uiscmdrsp_scsi {
* scsi.linuxstat is SAM_STAT_GOOD
* That is, there is NO error.
*/
-};
+} __packed;
/* Defines to support sending correct inquiry result when no disk is
* configured.
@@ -347,7 +344,7 @@ struct sense_data {
u8 additional_sense_code_qualifier;
u8 fru_code;
u8 sense_key_specific[3];
-};
+} __packed;
struct net_pkt_xmt {
int len;/* full length of data in the packet */
@@ -375,11 +372,11 @@ struct net_pkt_xmt {
* guest memory to get to the header. uisnic needs ethhdr to
* determine how to route the packet.
*/
-};
+} __packed;
struct net_pkt_xmtdone {
u32 xmt_done_result;/* result of NET_XMIT */
-};
+} __packed;
/* RCVPOST_BUF_SIZe must be at most page_size(4096) - cache_line_size (64) The
* reason is because dev_skb_alloc which is used to generate RCV_POST skbs in
@@ -401,7 +398,7 @@ struct net_pkt_rcvpost {
u64 unique_num; /* This is used to make sure that
* receive posts are returned to */
/* the Adapter which we sent them originally. */
-};
+} __packed;
struct net_pkt_rcv {
/* the number of receive buffers that can be chained */
@@ -415,17 +412,17 @@ struct net_pkt_rcv {
/* NOTE: first rcvbuf in the chain will also be provided in net.buf. */
u64 unique_num;
u32 rcvs_dropped_delta;
-};
+} __packed;
struct net_pkt_enbdis {
void *context;
u16 enable; /* 1 = enable, 0 = disable */
-};
+} __packed;
struct net_pkt_macaddr {
void *context;
u8 macaddr[MAX_MACADDR_LEN];/* 6 bytes */
-};
+} __packed;
/* cmd rsp packet used for VNIC network traffic */
struct uiscmdrsp_net {
@@ -442,7 +439,7 @@ struct uiscmdrsp_net {
/* and NET_CONNECT_STATUS */
struct net_pkt_macaddr macaddr;
};
-};
+} __packed;
struct uiscmdrsp_scsitaskmgmt {
enum task_mgmt_types tasktype;
@@ -479,7 +476,7 @@ struct uiscmdrsp_scsitaskmgmt {
/* result of taskmgmt command - set by IOPart - values are: */
#define TASK_MGMT_FAILED 0
-};
+} __packed;
/* The following is used by uissd to send disk add/remove notifications to
* Guest */
@@ -489,7 +486,7 @@ struct uiscmdrsp_disknotify {
void *v_hba;/* Pointer to vhba_info for channel info to
* route msg */
u32 channel, id, lun; /* SCSI Path of Disk to added or removed */
-};
+} __packed;
/* The following is used by virthba/vSCSI to send the Acquire/Release commands
* to the IOVM. */
@@ -528,7 +525,7 @@ struct uiscmdrsp_vdiskmgmt {
/* result of taskmgmt command - set by IOPart - values are: */
#define VDISK_MGMT_FAILED 0
-};
+} __packed;
/* keeping cmd & rsp inf
Re: [PATCH 5/7] staging: rtl8723au: issue_probersp(): remove unused parameter
Luca Ceresoli writes: > The is_valid_p2p_probereq is never referenced in the function body. > > Signed-off-by: Luca Ceresoli > Cc: Greg Kroah-Hartman > Cc: Jes Sorensen > Cc: Larry Finger > --- > drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 8 +++- > 1 file changed, 3 insertions(+), 5 deletions(-) Looks good Acked-by: Jes Sorensen ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 2/3] staging: unisys: convert pack pragma to __packed
On Fri, Jun 12, 2015 at 01:43:33PM -0400, Benjamin Romer wrote: > From: David Kershner > > It was noticed that iochannel.h was still using pragmas to > pack the datastructures, should be using __packed instead. > > Signed-off-by: David Kershner > Signed-off-by: Benjamin Romer > --- > drivers/staging/unisys/include/iochannel.h | 45 > +- > 1 file changed, 20 insertions(+), 25 deletions(-) > > diff --git a/drivers/staging/unisys/include/iochannel.h > b/drivers/staging/unisys/include/iochannel.h > index db7b332..1517496 100644 > --- a/drivers/staging/unisys/include/iochannel.h > +++ b/drivers/staging/unisys/include/iochannel.h > @@ -1,4 +1,5 @@ > /* Copyright (C) 2010 - 2013 UNISYS CORPORATION */ > + > /* All rights reserved. */ Odd newline added, why? ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 2/3] staging: unisys: convert pack pragma to __packed
On Fri, Jun 12, 2015 at 01:43:33PM -0400, Benjamin Romer wrote:
> From: David Kershner
>
> It was noticed that iochannel.h was still using pragmas to
> pack the datastructures, should be using __packed instead.
>
> Signed-off-by: David Kershner
> Signed-off-by: Benjamin Romer
> ---
> drivers/staging/unisys/include/iochannel.h | 45
> +-
> 1 file changed, 20 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/staging/unisys/include/iochannel.h
> b/drivers/staging/unisys/include/iochannel.h
> index db7b332..1517496 100644
> --- a/drivers/staging/unisys/include/iochannel.h
> +++ b/drivers/staging/unisys/include/iochannel.h
> @@ -1,4 +1,5 @@
> /* Copyright (C) 2010 - 2013 UNISYS CORPORATION */
> +
> /* All rights reserved. */
> #ifndef __IOCHANNEL_H__
> #define __IOCHANNEL_H__
> @@ -149,22 +150,18 @@ enum vdisk_mgmt_types {
>
> /* structs with pragma pack */
>
> -#pragma pack(push, 1)
> struct phys_info {
> u64 pi_pfn;
> u16 pi_off;
> u16 pi_len;
> -};
> -#pragma pack(pop)
> +} __packed;
> /* / BEGIN PRAGMA PACK PUSH 1 / */
> /* / ONLY STRUCT TYPE SHOULD BE BELOW */
You can delete this comment now, as it's not correct anymore.
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/3] staging: unisys: Move phys_info to iochannel.h
On Fri, Jun 12, 2015 at 01:43:32PM -0400, Benjamin Romer wrote:
> From: David Kershner
>
> This moves phys_info to iochannel.h. It is only
> used by iochannel.h and is not needed in
> vmcallinterfaces.h.
>
> Signed-off-by: David Kershner
> Signed-off-by: Benjamin Romer
> ---
> drivers/staging/unisys/include/iochannel.h| 7 +++
> drivers/staging/unisys/visorbus/vmcallinterface.h | 12
> 2 files changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/staging/unisys/include/iochannel.h
> b/drivers/staging/unisys/include/iochannel.h
> index cbb5875..db7b332 100644
> --- a/drivers/staging/unisys/include/iochannel.h
> +++ b/drivers/staging/unisys/include/iochannel.h
> @@ -149,6 +149,13 @@ enum vdisk_mgmt_types {
>
> /* structs with pragma pack */
>
> +#pragma pack(push, 1)
> +struct phys_info {
> + u64 pi_pfn;
> + u16 pi_off;
> + u16 pi_len;
> +};
> +#pragma pack(pop)
Use the __packed macro instead please, don't introduce something only to
fix it up later. Especially when you are not following the rules in
this file as described on the next line:
> /* / BEGIN PRAGMA PACK PUSH 1 / */
> /* / ONLY STRUCT TYPE SHOULD BE BELOW */
See?
Do it right the first time please.
thanks,
greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 3/3] staging: unisys: Don't hold device responses until driver loads
On Fri, Jun 12, 2015 at 01:43:34PM -0400, Benjamin Romer wrote:
> From: David Kershner
>
> Currently if a driver is not loaded for a device, we will not
> respond to the device create until it is done. This causes
> s-Par to not mark the partition running if the driver for the
> device is not loaded. Since there are several devices that
> could be assigned to a guest that don't have an actual
> driver this will cause us to never go running.
>
> If the device driver is loaded, we WILL continue to only
> respond to the device PAUSE message when the device driver
> has responded that it is done with the device.
>
> Signed-off-by: David Kershner
> Signed-off-by: Benjamin Romer
> ---
> drivers/staging/unisys/visorbus/visorbus_main.c | 28
> +++--
> 1 file changed, 7 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c
> b/drivers/staging/unisys/visorbus/visorbus_main.c
> index dcce1f0..ce35e85 100644
> --- a/drivers/staging/unisys/visorbus/visorbus_main.c
> +++ b/drivers/staging/unisys/visorbus/visorbus_main.c
> @@ -70,7 +70,6 @@ static const struct attribute_group *visorbus_bus_groups[]
> = {
> NULL,
> };
>
> -
> /** This describes the TYPE of bus.
> * (Don't confuse this with an INSTANCE of the bus.)
> */
> @@ -745,19 +744,6 @@ visordriver_probe_device(struct device *xdev)
> away:
> if (rc != 0)
> put_device(&dev->device);
> - /* We could get here more than once if the child driver module is
> - * unloaded and re-loaded while devices are present. That's why we
> - * need a flag to be sure that we only respond to the device_create
> - * once. We cannot respond to the device_create prior to here,
> - * because until we call drv->probe() above, the channel has not been
> - * initialized.
> - */
> - if (!dev->responded_to_device_create) {
> -
> - dev->responded_to_device_create = true;
> - if (chipset_responders.device_create)
> - (*chipset_responders.device_create)(dev, rc);
> - }
> return rc;
> }
>
> @@ -1306,15 +1292,15 @@ chipset_device_create(struct visor_device *dev_info)
>POSTCODE_SEVERITY_INFO);
>
> rc = create_visor_device(dev_info);
> - if (rc < 0) {
> + if (chipset_responders.device_create)
> + (*chipset_responders.device_create)(dev_info, rc);
Shouldn't that just be:
chipset_responders.device_create(dev_info, rc);
thanks,
greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 0/3] staging: unisys: visorbus fixes
On Fri, Jun 12, 2015 at 01:43:31PM -0400, Benjamin Romer wrote: > This series contains fixes for problems found while testing visorbus. > > David Kershner (3): > staging: unisys: Move phys_info to iochannel.h > staging: unisys: convert pack pragma to __packed > staging: unisys: Don't hold device responses until driver loads Please fix your fixes based on the fixes I proposed for them :) ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
RE: [PATCH 0/3] staging: unisys: visorbus fixes
Will do. Thanks. David Kershner > -Original Message- > From: Greg KH [mailto:gre...@linuxfoundation.org] > Sent: Friday, June 12, 2015 2:11 PM > To: Romer, Benjamin M > Cc: jes.soren...@redhat.com; driverdev-devel@linuxdriverproject.org; *S- > Par-Maintainer > Subject: Re: [PATCH 0/3] staging: unisys: visorbus fixes > > On Fri, Jun 12, 2015 at 01:43:31PM -0400, Benjamin Romer wrote: > > This series contains fixes for problems found while testing visorbus. > > > > David Kershner (3): > > staging: unisys: Move phys_info to iochannel.h > > staging: unisys: convert pack pragma to __packed > > staging: unisys: Don't hold device responses until driver loads > > Please fix your fixes based on the fixes I proposed for them :) ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: comedi: replace ENOSYS by proper error codes
From: Julien Dehee
comedi/comedi_fops.c
use ENODEV following open manual
comedi/drivers.c
use ENOTTY following ioctl manual
drivers/serial2002.c
use ENOTTY following ioctl manual
Signed-off-by: Julien Dehee
---
drivers/staging/comedi/comedi_fops.c| 2 +-
drivers/staging/comedi/drivers.c| 2 +-
drivers/staging/comedi/drivers/serial2002.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/comedi/comedi_fops.c
b/drivers/staging/comedi/comedi_fops.c
index 146ab00..6896a1f 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2611,7 +2611,7 @@ static int comedi_open(struct inode *inode, struct file
*file)
}
if (dev->attached && dev->use_count == 0) {
if (!try_module_get(dev->driver->module)) {
- rc = -ENOSYS;
+ rc = -ENODEV;
goto out;
}
if (dev->open) {
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index ed0b60c..db89096 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -820,7 +820,7 @@ int comedi_device_attach(struct comedi_device *dev, struct
comedi_devconfig *it)
"driver '%s' does not support attach using
comedi_config\n",
driv->driver_name);
module_put(driv->module);
- ret = -ENOSYS;
+ ret = -ENOTTY;
goto out;
}
dev->driver = driv;
diff --git a/drivers/staging/comedi/drivers/serial2002.c
b/drivers/staging/comedi/drivers/serial2002.c
index 83da162..929bf20 100644
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -101,7 +101,7 @@ static long serial2002_tty_ioctl(struct file *f, unsigned
op,
if (f->f_op->unlocked_ioctl)
return f->f_op->unlocked_ioctl(f, op, param);
- return -ENOSYS;
+ return -ENOTTY;
}
static int serial2002_tty_write(struct file *f, unsigned char *buf, int count)
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: comedi: replace ENOSYS by proper error codes
On Fri, Jun 12, 2015 at 10:20:38PM +0200, julien.de...@gmail.com wrote: > From: Julien Dehee > > comedi/comedi_fops.c > use ENODEV following open manual > > comedi/drivers.c > use ENOTTY following ioctl manual > > drivers/serial2002.c > use ENOTTY following ioctl manual What do you mean by "ioctl manual"? And shouldn't this be 3 different patches as they do different things to different drivers? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 1/3] staging: unisys: Move phys_info to iochannel.h
This moves phys_info to iochannel.h. It is only
used by iochannel.h and is not needed in
vmcallinterfaces.h.
Signed-off-by: David Kershner
---
drivers/staging/unisys/include/iochannel.h| 6 ++
drivers/staging/unisys/visorbus/vmcallinterface.h | 12
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/unisys/include/iochannel.h
b/drivers/staging/unisys/include/iochannel.h
index cbb5875..ee28cdc 100644
--- a/drivers/staging/unisys/include/iochannel.h
+++ b/drivers/staging/unisys/include/iochannel.h
@@ -149,6 +149,12 @@ enum vdisk_mgmt_types {
/* structs with pragma pack */
+struct phys_info {
+ u64 pi_pfn;
+ u16 pi_off;
+ u16 pi_len;
+} __packed;
+
/* / BEGIN PRAGMA PACK PUSH 1 / */
/* / ONLY STRUCT TYPE SHOULD BE BELOW */
diff --git a/drivers/staging/unisys/visorbus/vmcallinterface.h
b/drivers/staging/unisys/visorbus/vmcallinterface.h
index dc09caf..7a53df0 100644
--- a/drivers/staging/unisys/visorbus/vmcallinterface.h
+++ b/drivers/staging/unisys/visorbus/vmcallinterface.h
@@ -94,18 +94,6 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL
identification tuples */
/* / BEGIN PRAGMA PACK PUSH 1 / */
/* / ONLY STRUCT TYPE SHOULD BE BELOW */
#pragma pack(push, 1)
-struct phys_info {
- u64 pi_pfn;
- u16 pi_off;
- u16 pi_len;
-};
-
-#pragma pack(pop)
-/* / END PRAGMA PACK PUSH 1 /// */
-
-/* / BEGIN PRAGMA PACK PUSH 1 / */
-/* / ONLY STRUCT TYPE SHOULD BE BELOW */
-#pragma pack(push, 1)
/* Parameters to VMCALL_IO_CONTROLVM_ADDR interface */
struct vmcall_io_controlvm_addr_params {
/* The Guest-relative physical address of the ControlVm channel.
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 3/3] staging: unisys: Don't hold device responses until driver loads
Currently if a driver is not loaded for a device, we will not
respond to the device create until it is done. This causes
s-Par to not mark the partition running if the driver for the
device is not loaded. Since there are several devices that
could be assigned to a guest that don't have an actual
driver this will cause us to never go running.
If the device driver is loaded, we WILL continue to only
respond to the device PAUSE message when the device driver
has responded that it is done with the device.
Signed-off-by: David Kershner
---
drivers/staging/unisys/visorbus/visorbus_main.c | 28 +++--
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c
b/drivers/staging/unisys/visorbus/visorbus_main.c
index dcce1f0..b22af16 100644
--- a/drivers/staging/unisys/visorbus/visorbus_main.c
+++ b/drivers/staging/unisys/visorbus/visorbus_main.c
@@ -70,7 +70,6 @@ static const struct attribute_group *visorbus_bus_groups[] = {
NULL,
};
-
/** This describes the TYPE of bus.
* (Don't confuse this with an INSTANCE of the bus.)
*/
@@ -745,19 +744,6 @@ visordriver_probe_device(struct device *xdev)
away:
if (rc != 0)
put_device(&dev->device);
- /* We could get here more than once if the child driver module is
-* unloaded and re-loaded while devices are present. That's why we
-* need a flag to be sure that we only respond to the device_create
-* once. We cannot respond to the device_create prior to here,
-* because until we call drv->probe() above, the channel has not been
-* initialized.
-*/
- if (!dev->responded_to_device_create) {
-
- dev->responded_to_device_create = true;
- if (chipset_responders.device_create)
- (*chipset_responders.device_create)(dev, rc);
- }
return rc;
}
@@ -1306,15 +1292,15 @@ chipset_device_create(struct visor_device *dev_info)
POSTCODE_SEVERITY_INFO);
rc = create_visor_device(dev_info);
- if (rc < 0) {
+ if (chipset_responders.device_create)
+ chipset_responders.device_create(dev_info, rc);
+
+ if (rc < 0)
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
POSTCODE_SEVERITY_ERR);
- if (chipset_responders.device_create)
- (*chipset_responders.device_create)(dev_info, rc);
- }
-
- POSTCODE_LINUX_4(DEVICE_CREATE_SUCCESS_PC, dev_no, bus_no,
-POSTCODE_SEVERITY_INFO);
+ else
+ POSTCODE_LINUX_4(DEVICE_CREATE_SUCCESS_PC, dev_no, bus_no,
+POSTCODE_SEVERITY_INFO);
}
static void
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 0/3] staging: unisys: visorbus fixes
This series contains fixes for problems found while testing visorbus. v2 Updates: patch 1: made phys_info __packed coming into iochannel.h patch 2: Fixed up extra line and comments patch 3: Incorporated comments from gregkh. David Kershner (3): staging: unisys: Move phys_info to iochannel.h staging: unisys: convert pack pragma to __packed staging: unisys: Don't hold device responses until driver loads drivers/staging/unisys/include/iochannel.h| 49 +++ drivers/staging/unisys/visorbus/visorbus_main.c | 28 - drivers/staging/unisys/visorbus/vmcallinterface.h | 12 -- 3 files changed, 30 insertions(+), 59 deletions(-) -- 1.9.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 2/3] staging: unisys: convert pack pragma to __packed
It was noticed that iochannel.h was still using pragmas to
pack the datastructures, should be using __packed instead.
Signed-off-by: David Kershner
---
drivers/staging/unisys/include/iochannel.h | 45 --
1 file changed, 18 insertions(+), 27 deletions(-)
diff --git a/drivers/staging/unisys/include/iochannel.h
b/drivers/staging/unisys/include/iochannel.h
index ee28cdc..538036d 100644
--- a/drivers/staging/unisys/include/iochannel.h
+++ b/drivers/staging/unisys/include/iochannel.h
@@ -147,23 +147,16 @@ enum vdisk_mgmt_types {
VDISK_MGMT_RELEASE,
};
-/* structs with pragma pack */
-
struct phys_info {
u64 pi_pfn;
u16 pi_off;
u16 pi_len;
} __packed;
-/* / BEGIN PRAGMA PACK PUSH 1 / */
-/* / ONLY STRUCT TYPE SHOULD BE BELOW */
-
-#pragma pack(push, 1)
-
struct guest_phys_info {
u64 address;
u64 length;
-};
+} __packed;
#define GPI_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof(struct guest_phys_info))
@@ -171,12 +164,12 @@ struct uisscsi_dest {
u32 channel;/* channel == bus number */
u32 id; /* id == target number */
u32 lun;/* lun == logical unit number */
-};
+} __packed;
struct vhba_wwnn {
u32 wwnn1;
u32 wwnn2;
-};
+} __packed;
/* WARNING: Values stired in this structure must contain maximum counts (not
* maximum values). */
@@ -193,7 +186,7 @@ struct vhba_config_max {/* 20 bytes */
* bus */
/* max io size is often determined by the resource of the hba. e.g */
/* max scatter gather list length * page size / sector size */
-};
+} __packed;
struct uiscmdrsp_scsi {
void *scsicmd; /* the handle to the cmd that was received -
@@ -232,7 +225,7 @@ struct uiscmdrsp_scsi {
* scsi.linuxstat is SAM_STAT_GOOD
* That is, there is NO error.
*/
-};
+} __packed;
/* Defines to support sending correct inquiry result when no disk is
* configured.
@@ -346,7 +339,7 @@ struct sense_data {
u8 additional_sense_code_qualifier;
u8 fru_code;
u8 sense_key_specific[3];
-};
+} __packed;
struct net_pkt_xmt {
int len;/* full length of data in the packet */
@@ -374,11 +367,11 @@ struct net_pkt_xmt {
* guest memory to get to the header. uisnic needs ethhdr to
* determine how to route the packet.
*/
-};
+} __packed;
struct net_pkt_xmtdone {
u32 xmt_done_result;/* result of NET_XMIT */
-};
+} __packed;
/* RCVPOST_BUF_SIZe must be at most page_size(4096) - cache_line_size (64) The
* reason is because dev_skb_alloc which is used to generate RCV_POST skbs in
@@ -400,7 +393,7 @@ struct net_pkt_rcvpost {
u64 unique_num; /* This is used to make sure that
* receive posts are returned to */
/* the Adapter which we sent them originally. */
-};
+} __packed;
struct net_pkt_rcv {
/* the number of receive buffers that can be chained */
@@ -414,17 +407,17 @@ struct net_pkt_rcv {
/* NOTE: first rcvbuf in the chain will also be provided in net.buf. */
u64 unique_num;
u32 rcvs_dropped_delta;
-};
+} __packed;
struct net_pkt_enbdis {
void *context;
u16 enable; /* 1 = enable, 0 = disable */
-};
+} __packed;
struct net_pkt_macaddr {
void *context;
u8 macaddr[MAX_MACADDR_LEN];/* 6 bytes */
-};
+} __packed;
/* cmd rsp packet used for VNIC network traffic */
struct uiscmdrsp_net {
@@ -441,7 +434,7 @@ struct uiscmdrsp_net {
/* and NET_CONNECT_STATUS */
struct net_pkt_macaddr macaddr;
};
-};
+} __packed;
struct uiscmdrsp_scsitaskmgmt {
enum task_mgmt_types tasktype;
@@ -478,7 +471,7 @@ struct uiscmdrsp_scsitaskmgmt {
/* result of taskmgmt command - set by IOPart - values are: */
#define TASK_MGMT_FAILED 0
-};
+} __packed;
/* The following is used by uissd to send disk add/remove notifications to
* Guest */
@@ -488,7 +481,7 @@ struct uiscmdrsp_disknotify {
void *v_hba;/* Pointer to vhba_info for channel info to
* route msg */
u32 channel, id, lun; /* SCSI Path of Disk to added or removed */
-};
+} __packed;
/* The following is used by virthba/vSCSI to send the Acquire/Release commands
* to the IOVM. */
@@ -527,7 +520,7 @@ struct uiscmdrsp_vdiskmgmt {
/* result of taskmgmt command - set by IOPart - values are: */
#define VDISK_MGMT_FAILED 0
-};
+} __packed;
/* keeping cmd & rsp info in one structure for now cmd rsp packet for scsi */
struct uiscmdrsp {
@@ -551,7 +544,7 @@ struct uiscmdrsp {
struct uiscmdrsp *next; /* General Purpose Queue Link */
struct uiscmdrsp *activeQ_ne
Re: [PATCH] staging: comedi: replace ENOSYS by proper error codes
On Fri, 12 Jun 2015 13:43:27 -0700 Greg KH wrote: > On Fri, Jun 12, 2015 at 10:20:38PM +0200, julien.de...@gmail.com wrote: > > From: Julien Dehee > > > > comedi/comedi_fops.c > > use ENODEV following open manual That should probably be ENXIO by a strict reading, but Linux has always used ENODEV 8) > > > > comedi/drivers.c > > use ENOTTY following ioctl manual > > > > drivers/serial2002.c > > use ENOTTY following ioctl manual > > What do you mean by "ioctl manual"? man 2 ioctl Unknown ioctls on a device should error with ENOTTY. It's one of those crazy pieces of Unix history. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 0/6] staging: fbtft: style fixes
Several style patches (mostly breaking long lines and deleting line continuations). Anton Gerasimov (6): staging: fbtft: style fix on flexfb.c staging: fbtft: style fix on fb_tls8204.c staging: fbtft: style fix on fb_tinylcd.c staging: fbtft: style fix on fbtft_device.c staging: fbtft: style fix on fb_ra8875.c staging: fbtft: style fix on fb_ili9320.c drivers/staging/fbtft/fb_ili9320.c | 118 +++ drivers/staging/fbtft/fb_ra8875.c| 13 +- drivers/staging/fbtft/fb_tinylcd.c | 2 +- drivers/staging/fbtft/fb_tls8204.c | 11 +- drivers/staging/fbtft/fbtft_device.c | 54 --- drivers/staging/fbtft/flexfb.c | 281 ++- 6 files changed, 340 insertions(+), 139 deletions(-) -- 1.8.4.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/6] staging: fbtft: style fix on fb_tls8204.c
Signed-off-by: Anton Gerasimov
---
drivers/staging/fbtft/fb_tls8204.c | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/fbtft/fb_tls8204.c
b/drivers/staging/fbtft/fb_tls8204.c
index 5ea73b5..3253a25 100644
--- a/drivers/staging/fbtft/fb_tls8204.c
+++ b/drivers/staging/fbtft/fb_tls8204.c
@@ -35,7 +35,9 @@
#define WIDTH 84
#define HEIGHT 48
#define TXBUFLEN WIDTH
-#define DEFAULT_GAMMA "40" /* gamma is used to control contrast in this
driver */
+
+/* gamma is used to control contrast in this driver */
+#define DEFAULT_GAMMA "40"
static unsigned bs = 4;
module_param(bs, uint, 0);
@@ -51,7 +53,8 @@ static int init_display(struct fbtft_par *par)
write_reg(par, 0x21); /* 5:1 1
2:0 PD - Powerdown control: chip is active
1:0 V - Entry mode: horizontal addressing
-0:1 H - Extended instruction set control:
extended
+0:1 H - Extended instruction set control:
+ extended
*/
/* H=1 Bias system */
@@ -83,7 +86,9 @@ static int init_display(struct fbtft_par *par)
static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)
{
- fbtft_par_dbg(DEBUG_SET_ADDR_WIN, par, "%s(xs=%d, ys=%d, xe=%d,
ye=%d)\n", __func__, xs, ys, xe, ye);
+ fbtft_par_dbg(DEBUG_SET_ADDR_WIN, par,
+ "%s(xs=%d, ys=%d, xe=%d, ye=%d)\n",
+ __func__, xs, ys, xe, ye);
/* H=0 Set X address of RAM */
write_reg(par, 0x80); /* 7:1 1
--
1.8.4.5
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/6] staging: fbtft: style fix on flexfb.c
Signed-off-by: Anton Gerasimov
---
drivers/staging/fbtft/flexfb.c | 281 ++---
1 file changed, 209 insertions(+), 72 deletions(-)
diff --git a/drivers/staging/fbtft/flexfb.c b/drivers/staging/fbtft/flexfb.c
index ca39fe9..82c96fc 100644
--- a/drivers/staging/fbtft/flexfb.c
+++ b/drivers/staging/fbtft/flexfb.c
@@ -73,70 +73,193 @@ static int *initp;
static int initp_num;
/* default init sequences */
-static int st7735r_init[] = { \
--1,0x01,-2,150,-1,0x11,-2,500,-1,0xB1,0x01,0x2C,0x2D,-1,0xB2,0x01,0x2C,0x2D,-1,0xB3,0x01,0x2C,0x2D,0x01,0x2C,0x2D,
\
--1,0xB4,0x07,-1,0xC0,0xA2,0x02,0x84,-1,0xC1,0xC5,-1,0xC2,0x0A,0x00,-1,0xC3,0x8A,0x2A,-1,0xC4,0x8A,0xEE,-1,0xC5,0x0E,
\
--1,0x20,-1,0x36,0xC0,-1,0x3A,0x05,-1,0xE0,0x0f,0x1a,0x0f,0x18,0x2f,0x28,0x20,0x22,0x1f,0x1b,0x23,0x37,0x00,0x07,0x02,0x10,
\
--1,0xE1,0x0f,0x1b,0x0f,0x17,0x33,0x2c,0x29,0x2e,0x30,0x30,0x39,0x3f,0x00,0x07,0x03,0x10,-1,0x29,-2,100,-1,0x13,-2,10,-3
};
-
-static int ssd1289_init[] = { \
--1,0x00,0x0001,-1,0x03,0xA8A4,-1,0x0C,0x,-1,0x0D,0x080C,-1,0x0E,0x2B00,-1,0x1E,0x00B7,-1,0x01,0x2B3F,-1,0x02,0x0600,
\
--1,0x10,0x,-1,0x11,0x6070,-1,0x05,0x,-1,0x06,0x,-1,0x16,0xEF1C,-1,0x17,0x0003,-1,0x07,0x0233,-1,0x0B,0x,
\
--1,0x0F,0x,-1,0x41,0x,-1,0x42,0x,-1,0x48,0x,-1,0x49,0x013F,-1,0x4A,0x,-1,0x4B,0x,-1,0x44,0xEF00,
\
--1,0x45,0x,-1,0x46,0x013F,-1,0x30,0x0707,-1,0x31,0x0204,-1,0x32,0x0204,-1,0x33,0x0502,-1,0x34,0x0507,-1,0x35,0x0204,
\
--1,0x36,0x0204,-1,0x37,0x0502,-1,0x3A,0x0302,-1,0x3B,0x0302,-1,0x23,0x,-1,0x24,0x,-1,0x25,0x8000,-1,0x4f,0x,
\
--1,0x4e,0x,-1,0x22,-3 };
-
-static int hx8340bn_init[] = { \
--1,0xC1,0xFF,0x83,0x40,-1,0x11,-2,150,-1,0xCA,0x70,0x00,0xD9,-1,0xB0,0x01,0x11,
\
--1,0xC9,0x90,0x49,0x10,0x28,0x28,0x10,0x00,0x06,-2,20,-1,0xC2,0x60,0x71,0x01,0x0E,0x05,0x02,0x09,0x31,0x0A,
\
--1,0xC3,0x67,0x30,0x61,0x17,0x48,0x07,0x05,0x33,-2,10,-1,0xB5,0x35,0x20,0x45,-1,0xB4,0x33,0x25,0x4C,-2,10,
\
--1,0x3A,0x05,-1,0x29,-2,10,-3 };
-
-static int ili9225_init[] = { \
--1,0x0001,0x011C,-1,0x0002,0x0100,-1,0x0003,0x1030,-1,0x0008,0x0808,-1,0x000C,0x,-1,0x000F,0x0A01,-1,0x0020,0x,
\
--1,0x0021,0x,-2,50,-1,0x0010,0x0A00,-1,0x0011,0x1038,-2,50,-1,0x0012,0x1121,-1,0x0013,0x004E,-1,0x0014,0x676F,
\
--1,0x0030,0x,-1,0x0031,0x00DB,-1,0x0032,0x,-1,0x0033,0x,-1,0x0034,0x00DB,-1,0x0035,0x,-1,0x0036,0x00AF,
\
--1,0x0037,0x,-1,0x0038,0x00DB,-1,0x0039,0x,-1,0x0050,0x,-1,0x0051,0x060A,-1,0x0052,0x0D0A,-1,0x0053,0x0303,
\
--1,0x0054,0x0A0D,-1,0x0055,0x0A06,-1,0x0056,0x,-1,0x0057,0x0303,-1,0x0058,0x,-1,0x0059,0x,-2,50,
\
--1,0x0007,0x1017,-2,50,-3 };
-
-static int ili9320_init[] = { \
--1,0x00E5,0x8000,-1,0x,0x0001,-1,0x0001,0x0100,-1,0x0002,0x0700,-1,0x0003,0x1030,-1,0x0004,0x,-1,0x0008,0x0202,
\
--1,0x0009,0x,-1,0x000A,0x,-1,0x000C,0x,-1,0x000D,0x,-1,0x000F,0x,-1,0x0010,0x,-1,0x0011,0x0007,
\
--1,0x0012,0x,-1,0x0013,0x,-2,200,-1,0x0010,0x17B0,-1,0x0011,0x0031,-2,50,-1,0x0012,0x0138,-2,50,-1,0x0013,0x1800,
\
--1,0x0029,0x0008,-2,50,-1,0x0020,0x,-1,0x0021,0x,-1,0x0030,0x,-1,0x0031,0x0505,-1,0x0032,0x0004,
\
--1,0x0035,0x0006,-1,0x0036,0x0707,-1,0x0037,0x0105,-1,0x0038,0x0002,-1,0x0039,0x0707,-1,0x003C,0x0704,-1,0x003D,0x0807,
\
--1,0x0050,0x,-1,0x0051,0x00EF,-1,0x0052,0x,-1,0x0053,0x013F,-1,0x0060,0x2700,-1,0x0061,0x0001,-1,0x006A,0x,
\
--1,0x0080,0x,-1,0x0081,0x,-1,0x0082,0x,-1,0x0083,0x,-1,0x0084,0x,-1,0x0085,0x,-1,0x0090,0x0010,
\
--1,0x0092,0x,-1,0x0093,0x0003,-1,0x0095,0x0110,-1,0x0097,0x,-1,0x0098,0x,-1,0x0007,0x0173,-3
};
-
-static int ili9325_init[] = { \
--1,0x00E3,0x3008,-1,0x00E7,0x0012,-1,0x00EF,0x1231,-1,0x0001,0x0100,-1,0x0002,0x0700,-1,0x0003,0x1030,-1,0x0004,0x,
\
--1,0x0008,0x0207,-1,0x0009,0x,-1,0x000A,0x,-1,0x000C,0x,-1,0x000D,0x,-1,0x000F,0x,-1,0x0010,0x,
\
--1,0x0011,0x0007,-1,0x0012,0x,-1,0x0013,0x,-2,200,-1,0x0010,0x1690,-1,0x0011,0x0223,-2,50,-1,0x0012,0x000D,-2,50,
\
--1,0x0013,0x1200,-1,0x0029,0x000A,-1,0x002B,0x000C,-2,50,-1,0x0020,0x,-1,0x0021,0x,-1,0x0030,0x,
\
--1,0x0031,0x0506,-1,0x0032,0x0104,-1,0x0035,0x0207,-1,0x0036,0x000F,-1,0x0037,0x0306,-1,0x0038,0x0102,-1,0x0039,0x0707,
\
--1,0x003C,0x0702,-1,0x003D,0x1604,-1,0x0050,0x,-1,0x0051,0x00EF,-1,0x0052,0x,-1,0x0053,0x013F,-1,0x0060,0xA700,
\
--1,0x0061,0x0001,-1,0x006A,0x,-1,0x0080,0x,-1,0x0081,0x,-1,0x0082,0x,-1,0x0083,0x,-1,0x0084,0x,
\
--1,0x0085,0x,-1,0x0090,0x0010,-1,0x0092,0x0600,-1,0x0007,0x0133,-3 };
-
-static int ili9341_init[] = { \
--1,0x28,-2,20,-1,0xCF,0x00,0x83,0x30,-1,0xED,0x64,0x03,0x12,0x81,-1,0xE8,0x85,0x01,0x79,
\
--1,0xCB,0x39,0x2c,0x00,0x34,0x02,-1,0xF7,0x20,-1,0xEA,0x00,0x00,-1,0xC0,0x26,-1,0xC1,0x11,
\
--1,0xC5,0x35,0x3E,-1,0xC7,0xBE,-1,0xB1,0x00,0x1B,-1,0xB6,0x0a,0x82,0x27,0x00,-1,0xB7,0x07,
\
--
[PATCH 3/6] staging: fbtft: style fix on fb_tinylcd.c
Signed-off-by: Anton Gerasimov --- drivers/staging/fbtft/fb_tinylcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/fbtft/fb_tinylcd.c b/drivers/staging/fbtft/fb_tinylcd.c index c0b1a33..8ab177f 100644 --- a/drivers/staging/fbtft/fb_tinylcd.c +++ b/drivers/staging/fbtft/fb_tinylcd.c @@ -53,7 +53,7 @@ static int init_display(struct fbtft_par *par) write_reg(par, 0xE5, 0x00); write_reg(par, 0xF0, 0x36, 0xA5, 0x53); write_reg(par, 0xE0, 0x00, 0x35, 0x33, 0x00, 0x00, 0x00, -0x00, 0x35, 0x33, 0x00, 0x00, 0x00); + 0x00, 0x35, 0x33, 0x00, 0x00, 0x00); write_reg(par, 0x3A, 0x55); write_reg(par, 0x11); udelay(250); -- 1.8.4.5 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: comedi: replace ENOSYS by proper error codes
On Fri, Jun 12, 2015 at 10:06:16PM +0100, One Thousand Gnomes wrote: > On Fri, 12 Jun 2015 13:43:27 -0700 > Greg KH wrote: > > > On Fri, Jun 12, 2015 at 10:20:38PM +0200, julien.de...@gmail.com wrote: > > > From: Julien Dehee > > > > > > comedi/comedi_fops.c > > > use ENODEV following open manual > > That should probably be ENXIO by a strict reading, but Linux has always > used ENODEV 8) > > > > > > > comedi/drivers.c > > > use ENOTTY following ioctl manual > > > > > > drivers/serial2002.c > > > use ENOTTY following ioctl manual > > > > What do you mean by "ioctl manual"? > > man 2 ioctl > > Unknown ioctls on a device should error with ENOTTY. It's one of > those crazy pieces of Unix history. Note that the man 2 ioctl interface is not always what the kernel exposes, but rather, what your libc exposes to other programs. So setting these kernel values might not change what you get all the way through, have you tested it? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 4/6] staging: fbtft: style fix on fbtft_device.c
Signed-off-by: Anton Gerasimov
---
drivers/staging/fbtft/fbtft_device.c | 54 +---
1 file changed, 25 insertions(+), 29 deletions(-)
diff --git a/drivers/staging/fbtft/fbtft_device.c
b/drivers/staging/fbtft/fbtft_device.c
index df6cd77..211d504 100644
--- a/drivers/staging/fbtft/fbtft_device.c
+++ b/drivers/staging/fbtft/fbtft_device.c
@@ -34,8 +34,7 @@ static struct platform_device *p_device;
static char *name;
module_param(name, charp, 0);
-MODULE_PARM_DESC(name, "Devicename (required). " \
-"name=list => list all supported devices.");
+MODULE_PARM_DESC(name, "Devicename (required). name=list => list all supported
devices.");
static unsigned rotate;
module_param(rotate, uint, 0);
@@ -61,8 +60,7 @@ MODULE_PARM_DESC(mode, "SPI mode (override device default)");
static char *gpios;
module_param(gpios, charp, 0);
MODULE_PARM_DESC(gpios,
-"List of gpios. Comma separated with the form: reset:23,dc:24 " \
-"(when overriding the default, all gpios must be specified)");
+"List of gpios. Comma separated with the form: reset:23,dc:24 (when overriding
the default, all gpios must be specified)");
static unsigned fps;
module_param(fps, uint, 0);
@@ -88,8 +86,7 @@ MODULE_PARM_DESC(startbyte, "Sets the Start byte used by some
SPI displays.");
static bool custom;
module_param(custom, bool, 0);
-MODULE_PARM_DESC(custom, "Add a custom display device. " \
-"Use speed= argument to make it a SPI device, else platform_device");
+MODULE_PARM_DESC(custom, "Add a custom display device. Use speed= argument to
make it a SPI device, else platform_device");
static unsigned width;
module_param(width, uint, 0);
@@ -232,7 +229,7 @@ static struct fbtft_device_display displays[] = {
.display = {
.buswidth = 8,
.backlight = 1,
- .fbtftops.set_addr_win = \
+ .fbtftops.set_addr_win =
adafruit18_green_tab_set_addr_win,
},
.bgr = true,
@@ -558,8 +555,8 @@ static struct fbtft_device_display displays[] = {
.gpios = (const struct fbtft_gpio []) {
/* Wiring for LCD adapter kit */
{ "reset", 7 },
- { "dc", 0 },/* rev 2: 2 */
- { "wr", 1 },/* rev 2: 3 */
+ { "dc", 0 },/* rev 2: 2 */
+ { "wr", 1 },/* rev 2: 3 */
{ "cs", 8 },
{ "db00", 17 },
{ "db01", 18 },
@@ -776,13 +773,13 @@ static struct fbtft_device_display displays[] = {
{ "dc", 25 },
{},
},
- .gamma ="0 2 2 2 2 2 2 2 " \
- "2 2 2 2 2 2 2 2 " \
- "2 2 2 2 2 2 2 2 " \
- "2 2 2 2 2 2 2 3 " \
- "3 3 3 3 3 3 3 3 " \
- "3 3 3 3 3 3 3 3 " \
- "3 3 3 4 4 4 4 4 " \
+ .gamma ="0 2 2 2 2 2 2 2 "
+ "2 2 2 2 2 2 2 2 "
+ "2 2 2 2 2 2 2 2 "
+ "2 2 2 2 2 2 2 3 "
+ "3 3 3 3 3 3 3 3 "
+ "3 3 3 3 3 3 3 3 "
+ "3 3 3 4 4 4 4 4 "
"4 4 4 4 4 4 4"
}
}
@@ -896,7 +893,7 @@ static struct fbtft_device_display displays[] = {
.buswidth = 16,
.txbuflen = -2, /* disable buffer */
.backlight = 1,
- .fbtftops.write = \
+ .fbtftops.write =
fbtft_write_gpio16_wr_latched,
},
.bgr = true,
@@ -1063,7 +1060,8 @@ static struct fbtft_device_display displays[] = {
.display = {
.buswidth = 8,
.backlight = 1,
- .init_sequence =
wave
[PATCH 5/6] staging: fbtft: style fix on fb_ra8875.c
Signed-off-by: Anton Gerasimov
---
drivers/staging/fbtft/fb_ra8875.c | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/fbtft/fb_ra8875.c
b/drivers/staging/fbtft/fb_ra8875.c
index 2c4d4dc..54bc566 100644
--- a/drivers/staging/fbtft/fb_ra8875.c
+++ b/drivers/staging/fbtft/fb_ra8875.c
@@ -73,7 +73,9 @@ static int init_display(struct fbtft_par *par)
fbtft_par_dbg(DEBUG_INIT_DISPLAY, par,
"%s()\n", __func__);
fbtft_par_dbg(DEBUG_INIT_DISPLAY, par,
- "display size %dx%d\n", par->info->var.xres,
par->info->var.yres);
+ "display size %dx%d\n",
+ par->info->var.xres,
+ par->info->var.yres);
par->fbtftops.reset(par);
@@ -101,7 +103,8 @@ static int init_display(struct fbtft_par *par)
write_reg(par, 0x1D, 0x0E);
write_reg(par, 0x1E, 0x00);
write_reg(par, 0x1F, 0x02);
- } else if ((par->info->var.xres == 480) && (par->info->var.yres ==
272)) {
+ } else if ((par->info->var.xres == 480) &&
+ (par->info->var.yres == 272)) {
/* PLL clock frequency */
write_reg(par, 0x88, 0x0A);
write_reg(par, 0x89, 0x02);
@@ -125,7 +128,8 @@ static int init_display(struct fbtft_par *par)
write_reg(par, 0x1D, 0x07);
write_reg(par, 0x1E, 0x00);
write_reg(par, 0x1F, 0x09);
- } else if ((par->info->var.xres == 640) && (par->info->var.yres ==
480)) {
+ } else if ((par->info->var.xres == 640) &&
+ (par->info->var.yres == 480)) {
/* PLL clock frequency */
write_reg(par, 0x88, 0x0B);
write_reg(par, 0x89, 0x02);
@@ -149,7 +153,8 @@ static int init_display(struct fbtft_par *par)
write_reg(par, 0x1D, 0x0E);
write_reg(par, 0x1E, 0x00);
write_reg(par, 0x1F, 0x01);
- } else if ((par->info->var.xres == 800) && (par->info->var.yres ==
480)) {
+ } else if ((par->info->var.xres == 800) &&
+ (par->info->var.yres == 480)) {
/* PLL clock frequency */
write_reg(par, 0x88, 0x0B);
write_reg(par, 0x89, 0x02);
--
1.8.4.5
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 6/6] staging: fbtft: style fix on fb_ili9320.c
Signed-off-by: Anton Gerasimov --- drivers/staging/fbtft/fb_ili9320.c | 118 +++-- 1 file changed, 88 insertions(+), 30 deletions(-) diff --git a/drivers/staging/fbtft/fb_ili9320.c b/drivers/staging/fbtft/fb_ili9320.c index 3a02edd..0301bd5 100644 --- a/drivers/staging/fbtft/fb_ili9320.c +++ b/drivers/staging/fbtft/fb_ili9320.c @@ -63,43 +63,101 @@ static int init_display(struct fbtft_par *par) /* Initialization sequence from ILI9320 Application Notes */ /* *** Start Initial Sequence * */ - write_reg(par, 0x00E5, 0x8000); /* Set the Vcore voltage and this setting is must. */ - write_reg(par, 0x, 0x0001); /* Start internal OSC. */ - write_reg(par, 0x0001, 0x0100); /* set SS and SM bit */ - write_reg(par, 0x0002, 0x0700); /* set 1 line inversion */ - write_reg(par, 0x0004, 0x); /* Resize register */ - write_reg(par, 0x0008, 0x0202); /* set the back and front porch */ - write_reg(par, 0x0009, 0x); /* set non-display area refresh cycle */ - write_reg(par, 0x000A, 0x); /* FMARK function */ - write_reg(par, 0x000C, 0x); /* RGB interface setting */ - write_reg(par, 0x000D, 0x); /* Frame marker Position */ - write_reg(par, 0x000F, 0x); /* RGB interface polarity */ + /* Set the Vcore voltage and this setting is must. */ + write_reg(par, 0x00E5, 0x8000); + + /* Start internal OSC. */ + write_reg(par, 0x, 0x0001); + + /* set SS and SM bit */ + write_reg(par, 0x0001, 0x0100); + + /* set 1 line inversion */ + write_reg(par, 0x0002, 0x0700); + + /* Resize register */ + write_reg(par, 0x0004, 0x); + + /* set the back and front porch */ + write_reg(par, 0x0008, 0x0202); + + /* set non-display area refresh cycle */ + write_reg(par, 0x0009, 0x); + + /* FMARK function */ + write_reg(par, 0x000A, 0x); + + /* RGB interface setting */ + write_reg(par, 0x000C, 0x); + + /* Frame marker Position */ + write_reg(par, 0x000D, 0x); + + /* RGB interface polarity */ + write_reg(par, 0x000F, 0x); + /* ***Power On sequence *** */ - write_reg(par, 0x0010, 0x); /* SAP, BT[3:0], AP, DSTB, SLP, STB */ - write_reg(par, 0x0011, 0x0007); /* DC1[2:0], DC0[2:0], VC[2:0] */ - write_reg(par, 0x0012, 0x); /* VREG1OUT voltage */ - write_reg(par, 0x0013, 0x); /* VDV[4:0] for VCOM amplitude */ - mdelay(200); /* Dis-charge capacitor power voltage */ - write_reg(par, 0x0010, 0x17B0); /* SAP, BT[3:0], AP, DSTB, SLP, STB */ - write_reg(par, 0x0011, 0x0031); /* R11h=0x0031 at VCI=3.3V DC1[2:0], DC0[2:0], VC[2:0] */ + /* SAP, BT[3:0], AP, DSTB, SLP, STB */ + write_reg(par, 0x0010, 0x); + + /* DC1[2:0], DC0[2:0], VC[2:0] */ + write_reg(par, 0x0011, 0x0007); + + /* VREG1OUT voltage */ + write_reg(par, 0x0012, 0x); + + /* VDV[4:0] for VCOM amplitude */ + write_reg(par, 0x0013, 0x); + + /* Dis-charge capacitor power voltage */ + mdelay(200); + + /* SAP, BT[3:0], AP, DSTB, SLP, STB */ + write_reg(par, 0x0010, 0x17B0); + + /* R11h=0x0031 at VCI=3.3V DC1[2:0], DC0[2:0], VC[2:0] */ + write_reg(par, 0x0011, 0x0031); mdelay(50); - write_reg(par, 0x0012, 0x0138); /* R12h=0x0138 at VCI=3.3V VREG1OUT voltage */ + + /* R12h=0x0138 at VCI=3.3V VREG1OUT voltage */ + write_reg(par, 0x0012, 0x0138); mdelay(50); - write_reg(par, 0x0013, 0x1800); /* R13h=0x1800 at VCI=3.3V VDV[4:0] for VCOM amplitude */ - write_reg(par, 0x0029, 0x0008); /* R29h=0x0008 at VCI=3.3V VCM[4:0] for VCOMH */ + + /* R13h=0x1800 at VCI=3.3V VDV[4:0] for VCOM amplitude */ + write_reg(par, 0x0013, 0x1800); + + /* R29h=0x0008 at VCI=3.3V VCM[4:0] for VCOMH */ + write_reg(par, 0x0029, 0x0008); mdelay(50); - write_reg(par, 0x0020, 0x); /* GRAM horizontal Address */ - write_reg(par, 0x0021, 0x); /* GRAM Vertical Address */ + + /* GRAM horizontal Address */ + write_reg(par, 0x0020, 0x); + + /* GRAM Vertical Address */ + write_reg(par, 0x0021, 0x); /* -- Set GRAM area --- */ - write_reg(par, 0x0050, 0x); /* Horizontal GRAM Start Address */ - write_reg(par, 0x0051, 0x00EF); /* Horizontal GRAM End Address */ - write_reg(par, 0x0052, 0x); /* Vertical GRAM Start Address */ - write_reg(par, 0x0053, 0x013F); /* Vertical GRAM Start Address */ - write_reg(par, 0x0060, 0x2700); /* Gate Scan Line */ - write_reg(par, 0x0061, 0x0001); /* NDL,VLE, REV */ - write_reg(par, 0x006A, 0x); /* set scrolling line */ + /* Horizontal GRAM Start Address */ + write_reg(par, 0x0050, 0x); + + /* Hori
Re: [PATCH] staging: comedi: replace ENOSYS by proper error codes
On Fri, Jun 12, 2015 at 03:26:26PM -0700, Greg KH wrote: > On Fri, Jun 12, 2015 at 10:06:16PM +0100, One Thousand Gnomes wrote: > > On Fri, 12 Jun 2015 13:43:27 -0700 > > Greg KH wrote: > > > > > On Fri, Jun 12, 2015 at 10:20:38PM +0200, julien.de...@gmail.com wrote: > > > > From: Julien Dehee > > > > > > > > comedi/comedi_fops.c > > > > use ENODEV following open manual > > > > That should probably be ENXIO by a strict reading, but Linux has always > > used ENODEV 8) > > > > > > > > > > comedi/drivers.c > > > > use ENOTTY following ioctl manual > > > > > > > > drivers/serial2002.c > > > > use ENOTTY following ioctl manual > > > > > > What do you mean by "ioctl manual"? > > > > man 2 ioctl > > > > Unknown ioctls on a device should error with ENOTTY. It's one of > > those crazy pieces of Unix history. > > Note that the man 2 ioctl interface is not always what the kernel > exposes, but rather, what your libc exposes to other programs. So > setting these kernel values might not change what you get all the way > through, have you tested it? We also have the issue of the existing userspace comedi code, I don't know if it's handling the ioctl errors differently than ioctl(2) says, but that should be checked as well before I can take this patch. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 09/17] staging/lirc_serial: Remove TSC-based timing
It wasn't compiled in by default. I suspect that the driver was and
still is broken, though -- it's calling udelay with a parameter
that's derived from loops_per_jiffy.
Cc: Jarod Wilson
Cc: de...@driverdev.osuosl.org
Cc: Greg Kroah-Hartman
Signed-off-by: Andy Lutomirski
---
drivers/staging/media/lirc/lirc_serial.c | 63 ++--
1 file changed, 4 insertions(+), 59 deletions(-)
diff --git a/drivers/staging/media/lirc/lirc_serial.c
b/drivers/staging/media/lirc/lirc_serial.c
index dc7984455c3a..465796a686c4 100644
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -327,9 +327,6 @@ static void safe_udelay(unsigned long usecs)
* time
*/
-/* So send_pulse can quickly convert microseconds to clocks */
-static unsigned long conv_us_to_clocks;
-
static int init_timing_params(unsigned int new_duty_cycle,
unsigned int new_freq)
{
@@ -344,7 +341,6 @@ static int init_timing_params(unsigned int new_duty_cycle,
/* How many clocks in a microsecond?, avoiding long long divide */
work = loops_per_sec;
work *= 4295; /* 4295 = 2^32 / 1e6 */
- conv_us_to_clocks = work >> 32;
/*
* Carrier period in clocks, approach good up to 32GHz clock,
@@ -357,10 +353,9 @@ static int init_timing_params(unsigned int new_duty_cycle,
pulse_width = period * duty_cycle / 100;
space_width = period - pulse_width;
dprintk("in init_timing_params, freq=%d, duty_cycle=%d, "
- "clk/jiffy=%ld, pulse=%ld, space=%ld, "
- "conv_us_to_clocks=%ld\n",
+ "clk/jiffy=%ld, pulse=%ld, space=%ld\n",
freq, duty_cycle, __this_cpu_read(cpu_info.loops_per_jiffy),
- pulse_width, space_width, conv_us_to_clocks);
+ pulse_width, space_width);
return 0;
}
#else /* ! USE_RDTSC */
@@ -431,63 +426,14 @@ static long send_pulse_irdeo(unsigned long length)
return ret;
}
-#ifdef USE_RDTSC
-/* Version that uses Pentium rdtsc instruction to measure clocks */
-
-/*
- * This version does sub-microsecond timing using rdtsc instruction,
- * and does away with the fudged LIRC_SERIAL_TRANSMITTER_LATENCY
- * Implicitly i586 architecture... - Steve
- */
-
-static long send_pulse_homebrew_softcarrier(unsigned long length)
-{
- int flag;
- unsigned long target, start, now;
-
- /* Get going quick as we can */
- rdtscl(start);
- on();
- /* Convert length from microseconds to clocks */
- length *= conv_us_to_clocks;
- /* And loop till time is up - flipping at right intervals */
- now = start;
- target = pulse_width;
- flag = 1;
- /*
-* FIXME: This looks like a hard busy wait, without even an occasional,
-* polite, cpu_relax() call. There's got to be a better way?
-*
-* The i2c code has the result of a lot of bit-banging work, I wonder if
-* there's something there which could be helpful here.
-*/
- while ((now - start) < length) {
- /* Delay till flip time */
- do {
- rdtscl(now);
- } while ((now - start) < target);
-
- /* flip */
- if (flag) {
- rdtscl(now);
- off();
- target += space_width;
- } else {
- rdtscl(now); on();
- target += pulse_width;
- }
- flag = !flag;
- }
- rdtscl(now);
- return ((now - start) - length) / conv_us_to_clocks;
-}
-#else /* ! USE_RDTSC */
/* Version using udelay() */
/*
* here we use fixed point arithmetic, with 8
* fractional bits. that gets us within 0.1% or so of the right average
* frequency, albeit with some jitter in pulse length - Steve
+ *
+ * This should use ndelay instead.
*/
/* To match 8 fractional bits used for pulse/space length */
@@ -520,7 +466,6 @@ static long send_pulse_homebrew_softcarrier(unsigned long
length)
}
return (actual-length) >> 8;
}
-#endif /* USE_RDTSC */
static long send_pulse_homebrew(unsigned long length)
{
--
2.4.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2 09/17] staging/lirc_serial: Remove TSC-based timing
It wasn't compiled in by default. I suspect that the driver was and
still is broken, though -- it's calling udelay with a parameter
that's derived from loops_per_jiffy.
Cc: Jarod Wilson
Cc: de...@driverdev.osuosl.org
Cc: Greg Kroah-Hartman
Signed-off-by: Andy Lutomirski
---
drivers/staging/media/lirc/lirc_serial.c | 63 ++--
1 file changed, 4 insertions(+), 59 deletions(-)
diff --git a/drivers/staging/media/lirc/lirc_serial.c
b/drivers/staging/media/lirc/lirc_serial.c
index dc7984455c3a..465796a686c4 100644
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -327,9 +327,6 @@ static void safe_udelay(unsigned long usecs)
* time
*/
-/* So send_pulse can quickly convert microseconds to clocks */
-static unsigned long conv_us_to_clocks;
-
static int init_timing_params(unsigned int new_duty_cycle,
unsigned int new_freq)
{
@@ -344,7 +341,6 @@ static int init_timing_params(unsigned int new_duty_cycle,
/* How many clocks in a microsecond?, avoiding long long divide */
work = loops_per_sec;
work *= 4295; /* 4295 = 2^32 / 1e6 */
- conv_us_to_clocks = work >> 32;
/*
* Carrier period in clocks, approach good up to 32GHz clock,
@@ -357,10 +353,9 @@ static int init_timing_params(unsigned int new_duty_cycle,
pulse_width = period * duty_cycle / 100;
space_width = period - pulse_width;
dprintk("in init_timing_params, freq=%d, duty_cycle=%d, "
- "clk/jiffy=%ld, pulse=%ld, space=%ld, "
- "conv_us_to_clocks=%ld\n",
+ "clk/jiffy=%ld, pulse=%ld, space=%ld\n",
freq, duty_cycle, __this_cpu_read(cpu_info.loops_per_jiffy),
- pulse_width, space_width, conv_us_to_clocks);
+ pulse_width, space_width);
return 0;
}
#else /* ! USE_RDTSC */
@@ -431,63 +426,14 @@ static long send_pulse_irdeo(unsigned long length)
return ret;
}
-#ifdef USE_RDTSC
-/* Version that uses Pentium rdtsc instruction to measure clocks */
-
-/*
- * This version does sub-microsecond timing using rdtsc instruction,
- * and does away with the fudged LIRC_SERIAL_TRANSMITTER_LATENCY
- * Implicitly i586 architecture... - Steve
- */
-
-static long send_pulse_homebrew_softcarrier(unsigned long length)
-{
- int flag;
- unsigned long target, start, now;
-
- /* Get going quick as we can */
- rdtscl(start);
- on();
- /* Convert length from microseconds to clocks */
- length *= conv_us_to_clocks;
- /* And loop till time is up - flipping at right intervals */
- now = start;
- target = pulse_width;
- flag = 1;
- /*
-* FIXME: This looks like a hard busy wait, without even an occasional,
-* polite, cpu_relax() call. There's got to be a better way?
-*
-* The i2c code has the result of a lot of bit-banging work, I wonder if
-* there's something there which could be helpful here.
-*/
- while ((now - start) < length) {
- /* Delay till flip time */
- do {
- rdtscl(now);
- } while ((now - start) < target);
-
- /* flip */
- if (flag) {
- rdtscl(now);
- off();
- target += space_width;
- } else {
- rdtscl(now); on();
- target += pulse_width;
- }
- flag = !flag;
- }
- rdtscl(now);
- return ((now - start) - length) / conv_us_to_clocks;
-}
-#else /* ! USE_RDTSC */
/* Version using udelay() */
/*
* here we use fixed point arithmetic, with 8
* fractional bits. that gets us within 0.1% or so of the right average
* frequency, albeit with some jitter in pulse length - Steve
+ *
+ * This should use ndelay instead.
*/
/* To match 8 fractional bits used for pulse/space length */
@@ -520,7 +466,6 @@ static long send_pulse_homebrew_softcarrier(unsigned long
length)
}
return (actual-length) >> 8;
}
-#endif /* USE_RDTSC */
static long send_pulse_homebrew(unsigned long length)
{
--
2.4.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH V2 01/10] cpu-hotplug: export cpu_hotplug_enable/cpu_hotplug_disable
On Thu, Jun 04, 2015 at 04:26:07PM -0700, K. Y. Srinivasan wrote: > From: Vitaly Kuznetsov > > Loaded Hyper-V module will use these functions to disable CPU > hotplug under certain circumstances. Convert cpu_hotplug_disabled > to a counter (protected by cpu_add_remove_lock) to support e.g. > disable -> disable -> enable call sequences. > > Signed-off-by: Vitaly Kuznetsov > Signed-off-by: K. Y. Srinivasan > --- > Documentation/power/suspend-and-cpuhotplug.txt |6 +++--- > kernel/cpu.c | 13 - > 2 files changed, 11 insertions(+), 8 deletions(-) This changes the logic a bit, so I need an ack from the maintainers of the CPU hotplug code before I can accept this... thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: comedi: cb_pcimdas: fix handlers for DI and DO subdevices
On Fri, Jun 12, 2015 at 04:37:41PM +0100, Ian Abbott wrote:
> Normally, low-level Comedi drivers set an `insn_bits` handler for
> digital input (DI), digital output (DO) and digital input/output (DIO)
> subdevice types to handle normal reading and writing of digital
> channels. The "cb_pcimdas" driver currently has an `insn_read` handler
> for the DI subdevice and an `insn_write` handler for the DO subdevice.
> However, the actual handler functions `cb_pcimdas_di_insn_read()` and
> `cb_pcimdas_do_insn_write()` are written to behave like `insn_bits`
> handlers. Something's wrong there! To fix it, set the functions as
> `insn_bits` handlers and rename them for consistency.
>
> Fixes: e56d03dee14a ("staging: comedi: cb_pcimdas: add main connector digital
> input/output")
> Signed-off-by: Ian Abbott
> ---
> I left the "Fixes:" line non-line-wrapped. Is that the correct thing to
> do?
Sure, that's fine, thanks.
greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2 2/3] staging: unisys: convert pack pragma to __packed
On Fri, Jun 12, 2015 at 04:46:07PM -0400, David Kershner wrote: > It was noticed that iochannel.h was still using pragmas to > pack the datastructures, should be using __packed instead. > > Signed-off-by: David Kershner > --- > drivers/staging/unisys/include/iochannel.h | 45 > -- > 1 file changed, 18 insertions(+), 27 deletions(-) Other .h files also are like this in the driver, you should fix them up as well in future patches. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/6] staging: fbtft: style fix on flexfb.c
On Sat, Jun 13, 2015 at 01:06:41AM +0300, Anton Gerasimov wrote: > Signed-off-by: Anton Gerasimov I need a changelog body for this, and all of the other patches in this series. Describe what you are doing, "style fix" isn't very descriptive at all :( Please fix up all of these and resend. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: vt6656: Boolean tests don't need comparisons.
On Thu, Jun 11, 2015 at 09:36:58AM +, Abdul, Hussain (H.) wrote: > This patch remove true and false from boolean tests. > > Signed-off-by: Abdul Hussain > --- Please fix the From: issue :( ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: vt6655: Boolean tests don't need comparisons
On Fri, Jun 12, 2015 at 07:20:49AM +, Abdul, Hussain (H.) wrote: > From: Abdul Hussain > > This patch removes unwanted true from boolean tests. > > Signed-off-by: Abdul Hussain > --- > drivers/staging/vt6655/rxtx.c | 8 > 1 file changed, 4 insertions(+), 4 deletions(-) Someone from your same group sent this before you did. You all should talk... ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v4 0/7] staging: fsl-mc: New functionality to the MC bus driver
On Tue, Jun 09, 2015 at 04:59:01PM -0500, J. German Rivera wrote: > This patch series includes new functionality for the Freescale fsl-mc > bus driver. Why are people working on "new functionality" instead of working on getting this out of the staging tree? I really hate adding new functions to staging drivers, as this is not the correct place for drivers to be in the tree. People should be working to get them out of this location, and then you can add new functions to them. So I really don't want to take this series, sorry, someone better start working on getting this out of drivers/staging/ or I'm going to have to drop the driver entirely from the tree. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCHv3 08/16] staging: vme_user: provide DMA functionality
On Thu, May 28, 2015 at 03:07:05PM +0300, Dmitry Kalinkin wrote: > This introduces a new dma device that provides a single ioctl call that > provides DMA read and write functionality to the user space. > > Signed-off-by: Dmitry Kalinkin > Cc: Igor Alekseev > --- > drivers/staging/vme/devices/vme_user.c | 201 > - > drivers/staging/vme/devices/vme_user.h | 11 ++ > 2 files changed, 209 insertions(+), 3 deletions(-) I want to get Martyn's feedback on this, as it's adding a new feature to the subsystem that he's going to have to maintain. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCHv3 16/16] vme: provide uapi header
On Thu, May 28, 2015 at 03:07:13PM +0300, Dmitry Kalinkin wrote: > This separates VME related constants that are a part of both kernel and > user space API into a common uapi header. Why? We don't want non-userspace things in the uapi header file, that's not needed and just exports things to userspace we do not need/want there. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCHv3 00/16] vme DMA and user space driver improvements
On Wed, Jun 10, 2015 at 04:09:19PM +0300, Dmitry Kalinkin wrote: > On Sun, May 31, 2015 at 6:06 AM, Greg Kroah-Hartman > wrote: > > On Thu, May 28, 2015 at 03:06:57PM +0300, Dmitry Kalinkin wrote: > >> The first item in this submission documents previously introduced > >> vme_master_mmap() call. Following, there are three fixes for the tsi148 > >> driver's DMA. There was one bug that rendered it imposible to use DMA > >> lists with more than one item. The other was related to the place where > >> dma_map_single was called on the first DMA descriptor in the DMA list. The > >> last bug was about DMA transfer not stopping at interruption by signal, > >> which is a possible DoS attack vector. I also made an attempt to fix the > >> same issue in the ca91cx42 driver. I don't have access to this hardware to > >> test, so this is based only on my understanding of the datasheet (checked > >> ca91c042's errata as well). > >> > >> A new /sys/bus/vme/dma0 device with a new ioctl for making DMA transfers > >> was introduced in vme_user driver. The logic of the function is similar to > >> the one found in existing drivers. > >> > >> One question that I had while implementing this feature was whether we > >> should keep vme_dma_attr objects until vme_dma_list_exec() call. API > >> doesn't specify this, the existing vme bridge drivers copy all information > >> from attributes during vme_dma_list_add(). So for simplicity this > >> implementation frees vme_dma_attr's before vme_dma_list_exec() is done. > >> > >> Changes in v2 [patches 1-6, now 1-5 and 8]: > >> * vme_addr check for vme_user DMA > >> * limit on DMA operation length in vme_user > >> * reorder dma_op ioctl struct to omit __packed attribute > >> * change dma_op->write into dma_op->dir > >> * use vme_check_window assure DMA operation correctness > >> > >> New changes include vme_user code cleanup, a couple of ca91cx42 fixes > >> (again, tested for compilation only). > >> > >> I also propose a change to export some of VME subsytem related constants > >> to the user space. These can be useful if vme_user is to go into the > >> kernel. > >> Also, email > >> http://driverdev.linuxdriverproject.org/pipermail/driverdev-devel/2012-July/029084.html > >> mentions that we probably can now get rid of this comment: > >> > /* XXX We do not want to push aspace, cycle and width > >> > * to userspace as they are > >> > */ > >> > >> v3 adresses code style problems > > > > I need an ack from the VME maintainer before I can take these... > > > > thanks, > > > > greg k-h > > Greg, > > I don't know how to make this happen. I could resend patches CC'ing > previous contributors to linux VME subsystem, and maybe get some > feedback that way. > > Also, there are some patches that IMO don't need any special VME > subsystem expertise, namely: > Documentation: mention vme_master_mmap() in VME API > vme: ca91cx42: return error code on DMA error > staging: vme_user: remove unused counters > staging: vme_user: remove forward declarations > staging: vme_user: remove open/release > staging: vme_user: remove buf_unalloc helper > vme: tsi148: depend on HAS_DMA for Kconfig I've taken all of these except patches 12, 13, 14 and 16. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCHv3 00/16] vme DMA and user space driver improvements
On Sat, Jun 13, 2015 at 3:31 AM, Greg Kroah-Hartman wrote: > On Wed, Jun 10, 2015 at 04:09:19PM +0300, Dmitry Kalinkin wrote: >> Also, there are some patches that IMO don't need any special VME >> subsystem expertise, namely: >> Documentation: mention vme_master_mmap() in VME API >> vme: ca91cx42: return error code on DMA error >> staging: vme_user: remove unused counters >> staging: vme_user: remove forward declarations >> staging: vme_user: remove open/release >> staging: vme_user: remove buf_unalloc helper >> vme: tsi148: depend on HAS_DMA for Kconfig > > I've taken all of these except patches 12, 13, 14 and 16. > I thought 12 was the most harmless out of the whole set. Am I wrong? ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCHv3 00/16] vme DMA and user space driver improvements
On Sat, Jun 13, 2015 at 05:04:28AM +0300, Dmitry Kalinkin wrote: > On Sat, Jun 13, 2015 at 3:31 AM, Greg Kroah-Hartman > wrote: > > On Wed, Jun 10, 2015 at 04:09:19PM +0300, Dmitry Kalinkin wrote: > >> Also, there are some patches that IMO don't need any special VME > >> subsystem expertise, namely: > >> Documentation: mention vme_master_mmap() in VME API > >> vme: ca91cx42: return error code on DMA error > >> staging: vme_user: remove unused counters > >> staging: vme_user: remove forward declarations > >> staging: vme_user: remove open/release > >> staging: vme_user: remove buf_unalloc helper > >> vme: tsi148: depend on HAS_DMA for Kconfig > > > > I've taken all of these except patches 12, 13, 14 and 16. > > > I thought 12 was the most harmless out of the whole set. Am I wrong? You added a new userspace api, that someone else is going to have to maintain, that's not "harmless" at all. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCHv3 00/16] vme DMA and user space driver improvements
> On 13 Jun 2015, at 05:24, Greg Kroah-Hartman > wrote: > > On Sat, Jun 13, 2015 at 05:04:28AM +0300, Dmitry Kalinkin wrote: >> On Sat, Jun 13, 2015 at 3:31 AM, Greg Kroah-Hartman >> wrote: >> I thought 12 was the most harmless out of the whole set. Am I wrong? > > You added a new userspace api, that someone else is going to have to > maintain, that's not "harmless" at all. That is 16. 12, 13, 14 are unrelated to uapi: staging: vme_user: remove forward declarations staging: vme_user: remove open/release staging: vme_user: remove buf_unalloc helper ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: unisys: cleanup iochannel includes
The iochannel.h file no longer needs to include conttrolvmchannel.h, vbuschannel.h and vmcallinterfaces.h. Signed-off-by: David Kershner --- drivers/staging/unisys/include/iochannel.h | 6 -- 1 file changed, 6 deletions(-) diff --git a/drivers/staging/unisys/include/iochannel.h b/drivers/staging/unisys/include/iochannel.h index 538036d..64a581a 100644 --- a/drivers/staging/unisys/include/iochannel.h +++ b/drivers/staging/unisys/include/iochannel.h @@ -30,13 +30,7 @@ #include -#include "vmcallinterface.h" - -#define _ULTRA_CONTROLVM_CHANNEL_INLINE_ #include -#include "controlvmchannel.h" -#include "vbuschannel.h" -#undef _ULTRA_CONTROLVM_CHANNEL_INLINE_ #include "channel.h" #include "channel_guid.h" -- 1.9.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[staging:staging-testing 787/862] arch/m68k/include/asm/irq.h:77:12: error: expected '=', ',', '; ', 'asm' or '__attribute__' before 'void'
tree: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging-testing head: 5c10439849f75e408112d5f1696623b2fae5a500 commit: 12c41f001015eb00fff6c677a2d83332cfd2c8b9 [787/862] staging:lustre: merge socklnd_lib-linux.h into socklnd.h config: m68k-allmodconfig (attached as .config) reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout 12c41f001015eb00fff6c677a2d83332cfd2c8b9 # save the attached .config to linux build tree make.cross ARCH=m68k All error/warnings (new ones prefixed by >>): In file included from drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h:34:0, from drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c:44: >> arch/m68k/include/asm/irq.h:64:20: warning: 'struct pt_regs' declared inside >> parameter list struct pt_regs *)); ^ >> arch/m68k/include/asm/irq.h:64:20: warning: its scope is only this >> definition or declaration, which is probably not what you want >> arch/m68k/include/asm/irq.h:77:12: error: expected '=', ',', ';', 'asm' or >> '__attribute__' before 'void' asmlinkage void do_IRQ(int irq, struct pt_regs *regs); ^ >> arch/m68k/include/asm/irq.h:78:8: error: unknown type name 'atomic_t' extern atomic_t irq_err_count; ^ vim +77 arch/m68k/include/asm/irq.h 4936f63c Geert Uytterhoeven 2011-04-21 58 struct irq_chip; 4936f63c Geert Uytterhoeven 2011-04-21 59 struct irq_desc; 4936f63c Geert Uytterhoeven 2011-04-21 60 extern unsigned int m68k_irq_startup(struct irq_data *data); 4936f63c Geert Uytterhoeven 2011-04-21 61 extern unsigned int m68k_irq_startup_irq(unsigned int irq); 4936f63c Geert Uytterhoeven 2011-04-21 62 extern void m68k_irq_shutdown(struct irq_data *data); 4936f63c Geert Uytterhoeven 2011-04-21 63 extern void m68k_setup_auto_interrupt(void (*handler)(unsigned int, 4936f63c Geert Uytterhoeven 2011-04-21 @64 struct pt_regs *)); f30a6484 Geert Uytterhoeven 2011-09-11 65 extern void m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt); 4936f63c Geert Uytterhoeven 2011-04-21 66 extern void m68k_setup_irq_controller(struct irq_chip *, 4936f63c Geert Uytterhoeven 2011-04-21 67 void (*handle)(unsigned int irq, 4936f63c Geert Uytterhoeven 2011-04-21 68 struct irq_desc *desc), 4936f63c Geert Uytterhoeven 2011-04-21 69 unsigned int irq, unsigned int cnt); 4936f63c Geert Uytterhoeven 2011-04-21 70 4936f63c Geert Uytterhoeven 2011-04-21 71 extern unsigned int irq_canonicalize(unsigned int irq); 4936f63c Geert Uytterhoeven 2011-04-21 72 3ddc7e26 Greg Ungerer 2009-06-26 73 #else 3ddc7e26 Greg Ungerer 2009-06-26 74 #define irq_canonicalize(irq) (irq) 78ccdffc Greg Ungerer 2011-10-14 75 #endif /* !(CONFIG_M68020 || CONFIG_M68030 || CONFIG_M68040 || CONFIG_M68060) */ 3ddc7e26 Greg Ungerer 2009-06-26 76 739735d5 Geert Uytterhoeven 2011-07-03 @77 asmlinkage void do_IRQ(int irq, struct pt_regs *regs); 4936f63c Geert Uytterhoeven 2011-04-21 @78 extern atomic_t irq_err_count; 739735d5 Geert Uytterhoeven 2011-07-03 79 3ddc7e26 Greg Ungerer 2009-06-26 80 #endif /* _M68K_IRQ_H_ */ :: The code at line 77 was first introduced by commit :: 739735d5fea3c3997b2a659068a618b07bc9a73a m68knommu: Move forward declaration of do_IRQ() from machdep.h to irq.h :: TO: Geert Uytterhoeven :: CC: Greg Ungerer --- 0-DAY kernel test infrastructureOpen Source Technology Center http://lists.01.org/mailman/listinfo/kbuild Intel Corporation # # Automatically generated file; DO NOT EDIT. # Linux/m68k 4.1.0-rc7 Kernel Configuration # CONFIG_M68K=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_TIME_LOW_RES=y CONFIG_NO_IOPORT_MAP=y # CONFIG_NO_DMA is not set CONFIG_ZONE_DMA=y CONFIG_HZ=100 CONFIG_PGTABLE_LEVELS=3 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_CONSTRUCTORS=y CONFIG_IRQ_WORK=y # # General setup # CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" CONFIG_COMPILE_TEST=y CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_DEFAULT_HOSTNAME="(none)" CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_FHANDLE=y CONFIG_USELIB=y CONFIG_AUDIT=y # # IRQ subsystem # CONFIG_GENERIC_IRQ_SHOW=y CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN_DEBUG=y CONFIG_ARCH_USES_GETTIMEOFFSET=y # # CPU/Task time and stats accounting # CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOU
Re: [PATCHv3 00/16] vme DMA and user space driver improvements
On Sat, Jun 13, 2015 at 05:30:09AM +0300, Dmitry Kalinkin wrote: > > > On 13 Jun 2015, at 05:24, Greg Kroah-Hartman > > wrote: > > > > On Sat, Jun 13, 2015 at 05:04:28AM +0300, Dmitry Kalinkin wrote: > >> On Sat, Jun 13, 2015 at 3:31 AM, Greg Kroah-Hartman > >> wrote: > >> I thought 12 was the most harmless out of the whole set. Am I wrong? > > > > You added a new userspace api, that someone else is going to have to > > maintain, that's not "harmless" at all. > That is 16. Oops, no, that was 8, I didn't include that either, maybe that's why 12 and others didn't apply. Anyway, rebase on my tree and resend and we can go from there. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [staging:staging-testing 787/862] arch/m68k/include/asm/irq.h:77:12: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'void'
John, please send a fix for this. thanks, greg k-h On Sat, Jun 13, 2015 at 11:19:15AM +0800, kbuild test robot wrote: > tree: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git > staging-testing > head: 5c10439849f75e408112d5f1696623b2fae5a500 > commit: 12c41f001015eb00fff6c677a2d83332cfd2c8b9 [787/862] staging:lustre: > merge socklnd_lib-linux.h into socklnd.h > config: m68k-allmodconfig (attached as .config) > reproduce: > wget > https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross > -O ~/bin/make.cross > chmod +x ~/bin/make.cross > git checkout 12c41f001015eb00fff6c677a2d83332cfd2c8b9 > # save the attached .config to linux build tree > make.cross ARCH=m68k > > All error/warnings (new ones prefixed by >>): > >In file included from > drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h:34:0, > from > drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c:44: > >> arch/m68k/include/asm/irq.h:64:20: warning: 'struct pt_regs' declared > >> inside parameter list > struct pt_regs *)); >^ > >> arch/m68k/include/asm/irq.h:64:20: warning: its scope is only this > >> definition or declaration, which is probably not what you want > >> arch/m68k/include/asm/irq.h:77:12: error: expected '=', ',', ';', 'asm' or > >> '__attribute__' before 'void' > asmlinkage void do_IRQ(int irq, struct pt_regs *regs); >^ > >> arch/m68k/include/asm/irq.h:78:8: error: unknown type name 'atomic_t' > extern atomic_t irq_err_count; >^ > > vim +77 arch/m68k/include/asm/irq.h > > 4936f63c Geert Uytterhoeven 2011-04-21 58 struct irq_chip; > 4936f63c Geert Uytterhoeven 2011-04-21 59 struct irq_desc; > 4936f63c Geert Uytterhoeven 2011-04-21 60 extern unsigned int > m68k_irq_startup(struct irq_data *data); > 4936f63c Geert Uytterhoeven 2011-04-21 61 extern unsigned int > m68k_irq_startup_irq(unsigned int irq); > 4936f63c Geert Uytterhoeven 2011-04-21 62 extern void > m68k_irq_shutdown(struct irq_data *data); > 4936f63c Geert Uytterhoeven 2011-04-21 63 extern void > m68k_setup_auto_interrupt(void (*handler)(unsigned int, > 4936f63c Geert Uytterhoeven 2011-04-21 @64 > struct pt_regs *)); > f30a6484 Geert Uytterhoeven 2011-09-11 65 extern void > m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt); > 4936f63c Geert Uytterhoeven 2011-04-21 66 extern void > m68k_setup_irq_controller(struct irq_chip *, > 4936f63c Geert Uytterhoeven 2011-04-21 67 > void (*handle)(unsigned int irq, > 4936f63c Geert Uytterhoeven 2011-04-21 68 > struct irq_desc *desc), > 4936f63c Geert Uytterhoeven 2011-04-21 69 > unsigned int irq, unsigned int cnt); > 4936f63c Geert Uytterhoeven 2011-04-21 70 > 4936f63c Geert Uytterhoeven 2011-04-21 71 extern unsigned int > irq_canonicalize(unsigned int irq); > 4936f63c Geert Uytterhoeven 2011-04-21 72 > 3ddc7e26 Greg Ungerer 2009-06-26 73 #else > 3ddc7e26 Greg Ungerer 2009-06-26 74 #define irq_canonicalize(irq) > (irq) > 78ccdffc Greg Ungerer 2011-10-14 75 #endif /* !(CONFIG_M68020 || > CONFIG_M68030 || CONFIG_M68040 || CONFIG_M68060) */ > 3ddc7e26 Greg Ungerer 2009-06-26 76 > 739735d5 Geert Uytterhoeven 2011-07-03 @77 asmlinkage void do_IRQ(int irq, > struct pt_regs *regs); > 4936f63c Geert Uytterhoeven 2011-04-21 @78 extern atomic_t irq_err_count; > 739735d5 Geert Uytterhoeven 2011-07-03 79 > 3ddc7e26 Greg Ungerer 2009-06-26 80 #endif /* _M68K_IRQ_H_ */ > > :: The code at line 77 was first introduced by commit > :: 739735d5fea3c3997b2a659068a618b07bc9a73a m68knommu: Move forward > declaration of do_IRQ() from machdep.h to irq.h > > :: TO: Geert Uytterhoeven > :: CC: Greg Ungerer > > --- > 0-DAY kernel test infrastructureOpen Source Technology Center > http://lists.01.org/mailman/listinfo/kbuild Intel Corporation > # > # Automatically generated file; DO NOT EDIT. > # Linux/m68k 4.1.0-rc7 Kernel Configuration > # > CONFIG_M68K=y > CONFIG_RWSEM_GENERIC_SPINLOCK=y > CONFIG_GENERIC_HWEIGHT=y > CONFIG_GENERIC_CALIBRATE_DELAY=y > CONFIG_TIME_LOW_RES=y > CONFIG_NO_IOPORT_MAP=y > # CONFIG_NO_DMA is not set > CONFIG_ZONE_DMA=y > CONFIG_HZ=100 > CONFIG_PGTABLE_LEVELS=3 > CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" > CONFIG_CONSTRUCTORS=y > CONFIG_IRQ_WORK=y > > # > # General setup > # > CONFIG_BROKEN_ON_SMP=y > CONFIG_INIT_ENV_ARG_LIMIT=32 > CONFIG_CROSS_COMPILE="" > CONFIG_COMPILE_TEST=y > CONFIG_LOCALVERSION="" > CONFIG_LOCALVERSION_AUTO=y > CONFIG_DEFAULT_HOSTNAME="(none)" > CONFIG_SWAP=y > CONFIG_SYSVIPC=y > CONFIG_SYSVIPC_SYSCTL=y > CONFIG_POSIX_MQUEUE=y > CONFIG_POSIX_MQUEUE_SYSCTL=y > CONFIG_CROSS_MEMORY_ATTACH=y > CONFIG_FHANDLE=y > CONFIG_U
[PATCH 2/2] staging: wilc1000: remove itypes.h
Remove itypes.h that is not needed. Signed-off-by: Chaehyun Lim --- drivers/staging/wilc1000/coreconfigurator.c | 1 - drivers/staging/wilc1000/host_interface.c | 1 - drivers/staging/wilc1000/itypes.h | 39 - 3 files changed, 41 deletions(-) delete mode 100644 drivers/staging/wilc1000/itypes.h diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c index 9abc73d..792ba6d 100644 --- a/drivers/staging/wilc1000/coreconfigurator.c +++ b/drivers/staging/wilc1000/coreconfigurator.c @@ -12,7 +12,6 @@ /*/ /* File Includes */ /*/ -#include "itypes.h" #include "coreconfigurator.h" /*/ /* Constants */ diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index ca59f1b..1e9a2f1 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -1,6 +1,5 @@ #include "host_interface.h" #include "wilc_oswrapper.h" -#include "itypes.h" #include "coreconfigurator.h" extern s32 TransportInit(void); diff --git a/drivers/staging/wilc1000/itypes.h b/drivers/staging/wilc1000/itypes.h deleted file mode 100644 index d64ae35..000 --- a/drivers/staging/wilc1000/itypes.h +++ /dev/null @@ -1,39 +0,0 @@ -/*/ -/* */ -/* Ittiam 802.11 MAC SOFTWARE*/ -/* */ -/* ITTIAM SYSTEMS PVT LTD, BANGALORE*/ -/* COPYRIGHT(C) 2005 */ -/* */ -/* This program is proprietary to Ittiam Systems Private Limited and */ -/* is protected under Indian Copyright Law as an unpublished work. Its use */ -/* and disclosure is limited by the terms and conditions of a license */ -/* agreement. It may not be copied or otherwise reproduced or disclosed to */ -/* persons outside the licensee's organization except in accordance with the*/ -/* terms and conditions of such an agreement. All copies and */ -/* reproductions shall be the property of Ittiam Systems Private Limited and*/ -/* must bear this notice in its entirety. */ -/* */ -/*/ - -/*/ -/* */ -/* File Name : itypes.h */ -/* */ -/* Description : This file contains all the data type definitions for */ -/* MAC implementation. */ -/* */ -/* List of Functions : None */ -/* Issues / Problems : None */ -/* */ -/* Revision History : */ -/* */ -/* DD MM Author(s) Changes */ -/* 01 05 2005 Ittiam Draft*/ -/* */ -/*/ - -#ifndef ITYPES_H -#define ITYPES_H - -#endif /* ITYPES_H */ -- 1.9.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/2] staging: wilc1000: remove BOOL_T typedef
Remove BOOL_T typedef.
Signed-off-by: Chaehyun Lim
---
drivers/staging/wilc1000/host_interface.c | 6 +++---
drivers/staging/wilc1000/itypes.h | 9 -
2 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 17ab5cd..ca59f1b 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -7698,7 +7698,7 @@ static void *host_int_ParseJoinBssParam(tstrNetworkInfo
*ptstrNetworkInfo)
/* HT Cap. IE */
else if (pu8IEs[index] == HT_CAPABILITY_IE) {
/* if IE found set the flag */
- pNewJoinBssParam->ht_capable = BTRUE;
+ pNewJoinBssParam->ht_capable = true;
index += pu8IEs[index + 1] + 2; /* ID,Length
bytes and IE body */
/* PRINT_D(HOSTINF_DBG,"HT_CAPABALE\n"); */
continue;
@@ -7709,11 +7709,11 @@ static void *host_int_ParseJoinBssParam(tstrNetworkInfo
*ptstrNetworkInfo)
((pu8IEs[index + 6] == 0x00) ||
(pu8IEs[index + 6] == 0x01)) && /* OUI Sub Type */
(pu8IEs[index + 7] == 0x01)) {
/* Presence of WMM Info/Param element indicates
WMM capability */
- pNewJoinBssParam->wmm_cap = BTRUE;
+ pNewJoinBssParam->wmm_cap = true;
/* Check if Bit 7 is set indicating U-APSD
capability */
if (pu8IEs[index + 8] & (1 << 7)) {
- pNewJoinBssParam->uapsd_cap = BTRUE;
+ pNewJoinBssParam->uapsd_cap = true;
}
index += pu8IEs[index + 1] + 2;
continue;
diff --git a/drivers/staging/wilc1000/itypes.h
b/drivers/staging/wilc1000/itypes.h
index 2441853..d64ae35 100644
--- a/drivers/staging/wilc1000/itypes.h
+++ b/drivers/staging/wilc1000/itypes.h
@@ -36,13 +36,4 @@
#ifndef ITYPES_H
#define ITYPES_H
-/*/
-/* Enums */
-/*/
-
-typedef enum {
- BFALSE = 0,
- BTRUE = 1
-} BOOL_T;
-
#endif /* ITYPES_H */
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
