Re: [PATCH 1/4] staging/lustre: checkpatch cleanup: macros should not use a trailing semicolon
On Tue, Mar 10, 2015 at 07:17:52AM -0300, Mario J. Rugiero wrote: Signed-off-by: Mario J. Rugiero mrugi...@gmail.com --- You need to have something in the changelog area, it can't just be blank, sorry. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rtl8192e: remove unused functions
removed some functions which were not being used anywhere.
build tested and also verified by git grep that there is no other
reference to these functions.
Signed-off-by: Sudip Mukherjee su...@vectorindia.org
---
drivers/staging/rtl8192e/rtl819x_HTProc.c | 154 --
drivers/staging/rtl8192e/rtllib.h | 3 -
2 files changed, 157 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c
b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index 165975a..6157536 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -117,160 +117,6 @@ void HTUpdateDefaultSetting(struct rtllib_device *ieee)
pHTInfo-RxReorderPendingTime = 30;
}
-void HTDebugHTCapability(u8 *CapIE, u8 *TitleString)
-{
-
- static u8 EWC11NHTCap[] = {0x00, 0x90, 0x4c, 0x33};
- struct ht_capab_ele *pCapELE;
-
- if (!memcmp(CapIE, EWC11NHTCap, sizeof(EWC11NHTCap))) {
- RTLLIB_DEBUG(RTLLIB_DL_HT, EWC IE in %s()\n, __func__);
- pCapELE = (struct ht_capab_ele *)(CapIE[4]);
- } else
- pCapELE = (struct ht_capab_ele *)(CapIE[0]);
-
- RTLLIB_DEBUG(RTLLIB_DL_HT, Log HT Capability. Called by %s\n,
-TitleString);
-
- RTLLIB_DEBUG(RTLLIB_DL_HT, \tSupported Channel Width = %s\n,
-(pCapELE-ChlWidth) ? 20MHz : 20/40MHz);
- RTLLIB_DEBUG(RTLLIB_DL_HT, \tSupport Short GI for 20M = %s\n,
-(pCapELE-ShortGI20Mhz) ? YES : NO);
- RTLLIB_DEBUG(RTLLIB_DL_HT, \tSupport Short GI for 40M = %s\n,
-(pCapELE-ShortGI40Mhz) ? YES : NO);
- RTLLIB_DEBUG(RTLLIB_DL_HT, \tSupport TX STBC = %s\n,
-(pCapELE-TxSTBC) ? YES : NO);
- RTLLIB_DEBUG(RTLLIB_DL_HT, \tMax AMSDU Size = %s\n,
-(pCapELE-MaxAMSDUSize) ? 3839 : 7935);
- RTLLIB_DEBUG(RTLLIB_DL_HT, \tSupport CCK in 20/40 mode = %s\n,
-(pCapELE-DssCCk) ? YES : NO);
- RTLLIB_DEBUG(RTLLIB_DL_HT, \tMax AMPDU Factor = %d\n,
-pCapELE-MaxRxAMPDUFactor);
- RTLLIB_DEBUG(RTLLIB_DL_HT, \tMPDU Density = %d\n,
-pCapELE-MPDUDensity);
- RTLLIB_DEBUG(RTLLIB_DL_HT, \tMCS Rate Set = [%x][%x][%x][%x][%x]\n,
-pCapELE-MCS[0], pCapELE-MCS[1], pCapELE-MCS[2],
-pCapELE-MCS[3], pCapELE-MCS[4]);
- return;
-
-}
-
-void HTDebugHTInfo(u8 *InfoIE, u8 *TitleString)
-{
-
- static u8 EWC11NHTInfo[] = {0x00, 0x90, 0x4c, 0x34};
- struct ht_info_ele *pHTInfoEle;
-
- if (!memcmp(InfoIE, EWC11NHTInfo, sizeof(EWC11NHTInfo))) {
- RTLLIB_DEBUG(RTLLIB_DL_HT, EWC IE in %s()\n, __func__);
- pHTInfoEle = (struct ht_info_ele *)(InfoIE[4]);
- } else
- pHTInfoEle = (struct ht_info_ele *)(InfoIE[0]);
-
-
- RTLLIB_DEBUG(RTLLIB_DL_HT, Log HT Information Element.
-Called by %s\n, TitleString);
-
- RTLLIB_DEBUG(RTLLIB_DL_HT, \tPrimary channel = %d\n,
-pHTInfoEle-ControlChl);
- RTLLIB_DEBUG(RTLLIB_DL_HT, \tSenondary channel =);
- switch (pHTInfoEle-ExtChlOffset) {
- case 0:
- RTLLIB_DEBUG(RTLLIB_DL_HT, Not Present\n);
- break;
- case 1:
- RTLLIB_DEBUG(RTLLIB_DL_HT, Upper channel\n);
- break;
- case 2:
- RTLLIB_DEBUG(RTLLIB_DL_HT, Reserved. Eooro!!!\n);
- break;
- case 3:
- RTLLIB_DEBUG(RTLLIB_DL_HT, Lower Channel\n);
- break;
- }
- RTLLIB_DEBUG(RTLLIB_DL_HT, \tRecommended channel width = %s\n,
-(pHTInfoEle-RecommemdedTxWidth) ? 20Mhz : 40Mhz);
-
- RTLLIB_DEBUG(RTLLIB_DL_HT, \tOperation mode for protection = );
- switch (pHTInfoEle-OptMode) {
- case 0:
- RTLLIB_DEBUG(RTLLIB_DL_HT, No Protection\n);
- break;
- case 1:
- RTLLIB_DEBUG(RTLLIB_DL_HT, HT non-member protection mode\n);
- break;
- case 2:
- RTLLIB_DEBUG(RTLLIB_DL_HT, Suggest to open protection\n);
- break;
- case 3:
- RTLLIB_DEBUG(RTLLIB_DL_HT, HT mixed mode\n);
- break;
- }
-
- RTLLIB_DEBUG(RTLLIB_DL_HT, \tBasic MCS Rate Set = [%x][%x][%x][%x]
-[%x]\n, pHTInfoEle-BasicMSC[0], pHTInfoEle-BasicMSC[1],
-pHTInfoEle-BasicMSC[2], pHTInfoEle-BasicMSC[3],
-pHTInfoEle-BasicMSC[4]);
-}
-
-static bool IsHTHalfNmode40Bandwidth(struct rtllib_device *ieee)
-{
- boolretValue = false;
- struct rt_hi_throughput *pHTInfo = ieee-pHTInfo;
-
- if (pHTInfo-bCurrentHTSupport == false)
- retValue = false;
- else if (pHTInfo-bRegBW40MHz == false)
- retValue = false;
- else if
[PATCH 0/4] staging/lustre: checkpatch cleanup
As Dan Carpenter (thank you!) noticed, my original patchset had an extra from field and lacked the signed-off-by. I'm not sure the first was fixed, but I would be really confused if it isn't. I checked that the signed-off-by was generated this time. As a reminder, this patchset aims to fix the following checkpatch warnings: occurences of trailing semicolons in macros uses of __attribute__(format(printf, ...)) where __printf(...) can be used uses of __attribute__(aligned(size)) where __aligned(size) can be used uses of __attribute__(packed) where __packed can be used Regards, Mario. Mario J. Rugiero (4): staging/lustre: checkpatch cleanup: macros should not use a trailing semicolon staging/lustre: checkpatch cleanup: __printf(string-index, first-to-check) is preferred over __attribute__((format(printf, string-index, first-to-check))) staging/lustre: checkpatch cleanup: __aligned(size) is preferred over __attribute__((aligned(size))) staging/lustre: checkpatch cleanup: __packed is preferred over __attribute__((packed)) .../lustre/include/linux/libcfs/libcfs_debug.h | 6 +-- .../include/linux/libcfs/libcfs_kernelcomm.h | 4 +- .../lustre/include/linux/libcfs/libcfs_private.h | 4 +- .../staging/lustre/include/linux/lnet/lib-types.h | 2 +- .../staging/lustre/lustre/include/lprocfs_status.h | 6 +-- drivers/staging/lustre/lustre/include/lu_object.h | 2 +- .../lustre/lustre/include/lustre/lustre_idl.h | 44 +++--- .../lustre/lustre/include/lustre/lustre_user.h | 14 +++ drivers/staging/lustre/lustre/include/lustre_dlm.h | 2 +- drivers/staging/lustre/lustre/include/lustre_net.h | 2 +- 10 files changed, 43 insertions(+), 43 deletions(-) -- 2.3.2 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 2/4] staging/lustre: checkpatch cleanup: __printf(string-index, first-to-check) is preferred over __attribute__((format(printf, string-index, first-to-check)))
On Tue, Mar 10, 2015 at 07:17:53AM -0300, Mario J. Rugiero wrote: Signed-off-by: Mario J. Rugiero mrugi...@gmail.com --- Your subject line is really long, please fix, and again, add some comments in the changelog area. Same for the rest of the patches in this series. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: sm750fb: Cleanup the type of mmio750
On Tue, Mar 10, 2015 at 09:57:06AM +, Lorenzo Stoakes wrote: This patch assigns the more appropriate void* type to the mmio750 variable eliminating an unnecessary volatile qualifier in the process. Additionally it updates parameter types as necessary where those parameters interact with mmio750 and removes unnecessary casts. As a consequence, this patch fixes the following sparse warning:- drivers/staging/sm750fb/ddk750_help.c:12:17: warning: incorrect type in assignment (different address spaces) Signed-off-by: Lorenzo Stoakes lstoa...@gmail.com Looks good. Thanks for doing this. regards, dan carpenter ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/4] staging/lustre: checkpatch cleanup: macros should not use a trailing semicolon
That's weird, I passed the parameter signed-off-by to git-send-email. The from header must have been my mistake, I thought that parameter was mandatory. Thanks for the hint. Regards, Mario. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: sm750fb: Cleanup the type of mmio750
This patch assigns the more appropriate void* type to the mmio750 variable
eliminating an unnecessary volatile qualifier in the process. Additionally it
updates parameter types as necessary where those parameters interact with
mmio750 and removes unnecessary casts.
As a consequence, this patch fixes the following sparse warning:-
drivers/staging/sm750fb/ddk750_help.c:12:17: warning: incorrect type in
assignment (different address spaces)
Signed-off-by: Lorenzo Stoakes lstoa...@gmail.com
---
drivers/staging/sm750fb/ddk750_chip.h | 4 +++-
drivers/staging/sm750fb/ddk750_help.c | 4 ++--
drivers/staging/sm750fb/ddk750_help.h | 10 +-
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_chip.h
b/drivers/staging/sm750fb/ddk750_chip.h
index 1c78875..d067b06 100644
--- a/drivers/staging/sm750fb/ddk750_chip.h
+++ b/drivers/staging/sm750fb/ddk750_chip.h
@@ -3,6 +3,8 @@
#define DEFAULT_INPUT_CLOCK 14318181 /* Default reference clock */
#define SM750LE_REVISION_ID (char)0xfe
+#include linux/io.h
+
/* This is all the chips recognized by this library */
typedef enum _logical_chip_type_t
{
@@ -70,7 +72,7 @@ logical_chip_type_t getChipType(void);
unsigned int calcPllValue(unsigned int request,pll_value_t *pll);
unsigned int calcPllValue2(unsigned int,pll_value_t *);
unsigned int formatPllReg(pll_value_t *pPLL);
-void ddk750_set_mmio(volatile unsigned char *,unsigned short,char);
+void ddk750_set_mmio(void __iomem *,unsigned short,char);
unsigned int ddk750_getVMSize(void);
int ddk750_initHw(initchip_param_t *);
unsigned int getPllValue(clock_type_t clockType, pll_value_t *pPLL);
diff --git a/drivers/staging/sm750fb/ddk750_help.c
b/drivers/staging/sm750fb/ddk750_help.c
index cc00d2b..c68ff3b 100644
--- a/drivers/staging/sm750fb/ddk750_help.c
+++ b/drivers/staging/sm750fb/ddk750_help.c
@@ -2,12 +2,12 @@
//#include ddk750_chip.h
#include ddk750_help.h
-volatile unsigned char __iomem * mmio750 = NULL;
+void __iomem * mmio750 = NULL;
char revId750 = 0;
unsigned short devId750 = 0;
/* after driver mapped io registers, use this function first */
-void ddk750_set_mmio(volatile unsigned char * addr,unsigned short devId,char
revId)
+void ddk750_set_mmio(void __iomem * addr,unsigned short devId,char revId)
{
mmio750 = addr;
devId750 = devId;
diff --git a/drivers/staging/sm750fb/ddk750_help.h
b/drivers/staging/sm750fb/ddk750_help.h
index 4fc93b5..07c8264 100644
--- a/drivers/staging/sm750fb/ddk750_help.h
+++ b/drivers/staging/sm750fb/ddk750_help.h
@@ -12,14 +12,14 @@
#if 0
/* if 718 big endian turned on,be aware that don't use this driver for general
use,only for ppc big-endian */
#warning big endian on target cpu and enable nature big endian support of 718
capability !
-#define PEEK32(addr) __raw_readl((void __iomem
*)(mmio750)+(addr))
-#define POKE32(addr,data) __raw_writel((data),(void
__iomem*)(mmio750)+(addr))
+#define PEEK32(addr) __raw_readl(mmio750 + addr)
+#define POKE32(addr,data) __raw_writel(data, mmio750 + addr)
#else /* software control endianess */
-#define PEEK32(addr) readl((addr)+mmio750)
-#define POKE32(addr,data) writel((data),(addr)+mmio750)
+#define PEEK32(addr) readl(addr + mmio750)
+#define POKE32(addr,data) writel(data, addr + mmio750)
#endif
-extern volatile unsigned char __iomem * mmio750;
+extern void __iomem * mmio750;
extern char revId750;
extern unsigned short devId750;
#else
--
2.3.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] SCSI:STORVSC Use SCSI layer to allocate memory for per-command device request data
On Mon, Dec 29, Christoph Hellwig wrote:
+++ b/drivers/scsi/storvsc_drv.c
static struct scsi_host_template scsi_driver = {
.module = THIS_MODULE,
.name = storvsc_host_t,
+ .cmd_size = sizeof(struct storvsc_cmd_request),
.bios_param = storvsc_get_chs,
.queuecommand = storvsc_queuecommand,
.eh_host_reset_handler =storvsc_host_reset_handler,
+ .proc_name =storvsc_host,
It would be nice to change .proc_name to KBUILD_MODNAME before v4.0 is
released. We carry a patch which adds this field. Of cource we can just
change the patch, but if code gets touched upstream anyway...
Olaf
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/4] staging/lustre: checkpatch cleanup: __printf(string-index, first-to-check) is preferred over __attribute__((format(printf, string-index, first-to-check)))
Signed-off-by: Mario J. Rugiero mrugi...@gmail.com
---
drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h | 4 ++--
drivers/staging/lustre/lustre/include/lu_object.h | 2 +-
drivers/staging/lustre/lustre/include/lustre_dlm.h | 2 +-
drivers/staging/lustre/lustre/include/lustre_net.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
index 840dd1b..8251ac9 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
@@ -244,12 +244,12 @@ do {
\
int libcfs_debug_msg(struct libcfs_debug_msg_data *msgdata,
const char *format1, ...)
- __attribute__ ((format (printf, 2, 3)));
+ __printf(2, 3);
int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,
const char *format1,
va_list args, const char *format2, ...)
- __attribute__ ((format (printf, 4, 5)));
+ __printf(4, 5);
/* other external symbols that tracefile provides: */
int cfs_trace_copyin_string(char *knl_buffer, int knl_buffer_nob,
diff --git a/drivers/staging/lustre/lustre/include/lu_object.h
b/drivers/staging/lustre/lustre/include/lu_object.h
index fc3f234..7f8871e 100644
--- a/drivers/staging/lustre/lustre/include/lu_object.h
+++ b/drivers/staging/lustre/lustre/include/lu_object.h
@@ -192,7 +192,7 @@ struct lu_object_conf {
*/
typedef int (*lu_printer_t)(const struct lu_env *env,
void *cookie, const char *format, ...)
- __attribute__ ((format (printf, 3, 4)));
+ __printf(3, 4);
/**
* Operations specific for particular lu_object.
diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h
b/drivers/staging/lustre/lustre/include/lustre_dlm.h
index 6be6079..b682a60 100644
--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
@@ -1075,7 +1075,7 @@ extern char *ldlm_it2str(int it);
void _ldlm_lock_debug(struct ldlm_lock *lock,
struct libcfs_debug_msg_data *data,
const char *fmt, ...)
- __attribute__ ((format (printf, 3, 4)));
+ __printf(3, 4);
/**
* Rate-limited version of lock printing function.
diff --git a/drivers/staging/lustre/lustre/include/lustre_net.h
b/drivers/staging/lustre/lustre/include/lustre_net.h
index 36396d1..e2805bd 100644
--- a/drivers/staging/lustre/lustre/include/lustre_net.h
+++ b/drivers/staging/lustre/lustre/include/lustre_net.h
@@ -1673,7 +1673,7 @@ ptlrpc_rqphase2str(struct ptlrpc_request *req)
void _debug_req(struct ptlrpc_request *req,
struct libcfs_debug_msg_data *data, const char *fmt, ...)
- __attribute__ ((format (printf, 3, 4)));
+ __printf(3, 4);
/**
* Helper that decides if we need to print request according to current debug
--
2.3.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/4] staging/lustre: checkpatch cleanup: __aligned(size) is preferred over __attribute__((aligned(size)))
Signed-off-by: Mario J. Rugiero mrugi...@gmail.com
---
drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
b/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
index f19a121..4688770 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
@@ -58,7 +58,7 @@ struct kuc_hdr {
__u8 kuc_flags;
__u16 kuc_msgtype;/* Message type or opcode, transport-specific */
__u16 kuc_msglen; /* Including header */
-} __attribute__((aligned(sizeof(__u64;
+} __aligned(sizeof(__u64));
#define KUC_CHANGELOG_MSG_MAXSIZE (sizeof(struct kuc_hdr)+CR_MAXSIZE)
--
2.3.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 4/4] staging/lustre: checkpatch cleanup: __packed is preferred over __attribute__((packed))
Signed-off-by: Mario J. Rugiero mrugi...@gmail.com
---
.../include/linux/libcfs/libcfs_kernelcomm.h | 2 +-
.../staging/lustre/include/linux/lnet/lib-types.h | 2 +-
.../lustre/lustre/include/lustre/lustre_idl.h | 44 +++---
.../lustre/lustre/include/lustre/lustre_user.h | 14 +++
4 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
b/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
index 4688770..a989d26 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
@@ -107,7 +107,7 @@ typedef struct lustre_kernelcomm {
__u32 lk_group;
__u32 lk_data;
__u32 lk_flags;
-} __attribute__((packed)) lustre_kernelcomm;
+} __packed lustre_kernelcomm;
/* Userspace methods */
int libcfs_ukuc_start(lustre_kernelcomm *l, int groups);
diff --git a/drivers/staging/lustre/include/linux/lnet/lib-types.h
b/drivers/staging/lustre/include/linux/lnet/lib-types.h
index 50537668..feffca2 100644
--- a/drivers/staging/lustre/include/linux/lnet/lib-types.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-types.h
@@ -48,7 +48,7 @@
#include linux/list.h
#include types.h
-#define WIRE_ATTR __attribute__((packed))
+#define WIRE_ATTR __packed
/* Packed version of lnet_process_id_t to transfer via network */
typedef struct {
diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
index 5382bf4..0553043 100644
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
@@ -2954,7 +2954,7 @@ typedef enum {
struct llog_logid {
struct ost_id lgl_oi;
__u32 lgl_ogen;
-} __attribute__((packed));
+} __packed;
/** Records written to the CATALOGS list */
#define CATLIST CATALOGS
@@ -2963,7 +2963,7 @@ struct llog_catid {
__u32 lci_padding1;
__u32 lci_padding2;
__u32 lci_padding3;
-} __attribute__((packed));
+} __packed;
/* Log data record types - there is no specific reason that these need to
* be related to the RPC opcodes, but no reason not to (may be handy later?)
@@ -3027,7 +3027,7 @@ struct llog_logid_rec {
__u64 lid_padding2;
__u64 lid_padding3;
struct llog_rec_taillid_tail;
-} __attribute__((packed));
+} __packed;
struct llog_unlink_rec {
struct llog_rec_hdr lur_hdr;
@@ -3035,7 +3035,7 @@ struct llog_unlink_rec {
__u32 lur_oseq;
__u32 lur_count;
struct llog_rec_taillur_tail;
-} __attribute__((packed));
+} __packed;
struct llog_unlink64_rec {
struct llog_rec_hdr lur_hdr;
@@ -3045,7 +3045,7 @@ struct llog_unlink64_rec {
__u64 lur_padding2;
__u64 lur_padding3;
struct llog_rec_taillur_tail;
-} __attribute__((packed));
+} __packed;
struct llog_setattr64_rec {
struct llog_rec_hdr lsr_hdr;
@@ -3056,7 +3056,7 @@ struct llog_setattr64_rec {
__u32 lsr_gid_h;
__u64 lsr_padding;
struct llog_rec_taillsr_tail;
-} __attribute__((packed));
+} __packed;
struct llog_size_change_rec {
struct llog_rec_hdr lsc_hdr;
@@ -3066,7 +3066,7 @@ struct llog_size_change_rec {
__u64 lsc_padding2;
__u64 lsc_padding3;
struct llog_rec_taillsc_tail;
-} __attribute__((packed));
+} __packed;
#define CHANGELOG_MAGIC 0xca103000
@@ -3083,20 +3083,20 @@ struct llog_size_change_rec {
struct changelog_setinfo {
__u64 cs_recno;
__u32 cs_id;
-} __attribute__((packed));
+} __packed;
/** changelog record */
struct llog_changelog_rec {
struct llog_rec_hdr cr_hdr;
struct changelog_rec cr;
struct llog_rec_tail cr_tail; /** for_sizezof_only */
-} __attribute__((packed));
+} __packed;
struct llog_changelog_ext_rec {
struct llog_rec_hdr cr_hdr;
struct changelog_ext_rec cr;
struct llog_rec_tail cr_tail; /** for_sizezof_only */
-} __attribute__((packed));
+} __packed;
#define CHANGELOG_USER_PREFIX cl
@@ -3106,7 +3106,7 @@ struct llog_changelog_user_rec {
__u32cur_padding;
__u64cur_endrec;
struct llog_rec_tail cur_tail;
-} __attribute__((packed));
+} __packed;
enum agent_req_status {
ARS_WAITING,
@@ -3152,13 +3152,13 @@ struct llog_agent_req_rec {
__u64 arr_req_change; /** req. status change time */
struct hsm_action_item arr_hai;/** req. to the agent */
struct llog_rec_tailarr_tail; /** record tail
[PATCH 1/4] staging/lustre: checkpatch cleanup: macros should not use a trailing semicolon
Signed-off-by: Mario J. Rugiero mrugi...@gmail.com
---
drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h | 2 +-
drivers/staging/lustre/include/linux/libcfs/libcfs_private.h | 4 ++--
drivers/staging/lustre/lustre/include/lprocfs_status.h | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
index 2e5a9e5..840dd1b 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
@@ -196,7 +196,7 @@ do {
\
.msg_fn = __func__, \
.msg_line = __LINE__, \
.msg_cdls = (cdls) }; \
- dataname.msg_mask = (mask);
+ dataname.msg_mask = (mask)
/**
* Filters out logging messages based on mask and subsystem.
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
index ac9238a..515a54e 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
@@ -317,8 +317,8 @@ do {
\
#define LASSERT_ATOMIC_ZERO(a) LASSERT_ATOMIC_EQ(a, 0)
#define LASSERT_ATOMIC_POS(a) LASSERT_ATOMIC_GT(a, 0)
-#define CFS_ALLOC_PTR(ptr) LIBCFS_ALLOC(ptr, sizeof(*(ptr)));
-#define CFS_FREE_PTR(ptr) LIBCFS_FREE(ptr, sizeof(*(ptr)));
+#define CFS_ALLOC_PTR(ptr) LIBCFS_ALLOC(ptr, sizeof(*(ptr)))
+#define CFS_FREE_PTR(ptr) LIBCFS_FREE(ptr, sizeof(*(ptr)))
/*
* percpu partition lock
diff --git a/drivers/staging/lustre/lustre/include/lprocfs_status.h
b/drivers/staging/lustre/lustre/include/lprocfs_status.h
index 8a25cf6..d030847 100644
--- a/drivers/staging/lustre/lustre/include/lprocfs_status.h
+++ b/drivers/staging/lustre/lustre/include/lprocfs_status.h
@@ -679,7 +679,7 @@ extern int lprocfs_seq_release(struct inode *, struct file
*);
} \
} while (0)
#define LPROCFS_CLIMP_EXIT(obd) \
- up_read((obd)-u.cli.cl_sem);
+ up_read((obd)-u.cli.cl_sem)
/* write the name##_seq_show function, call LPROC_SEQ_FOPS_RO for read-only
@@ -723,7 +723,7 @@ static struct file_operations name##_fops = {
\
return lprocfs_wr_##type(file, buffer, \
count, seq-private); \
} \
- LPROC_SEQ_FOPS(name##_##type);
+ LPROC_SEQ_FOPS(name##_##type)
#define LPROC_SEQ_FOPS_WR_ONLY(name, type) \
static ssize_t name##_##type##_write(struct file *file, \
@@ -740,7 +740,7 @@ static struct file_operations name##_fops = {
\
.open = name##_##type##_open, \
.write = name##_##type##_write,\
.release = lprocfs_single_release, \
- };
+ }
/* lproc_ptlrpc.c */
struct ptlrpc_request;
--
2.3.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: sm750fb: Cleanup the type of mmio750
On 10 March 2015 at 12:36, Sudip Mukherjee sudipm.mukher...@gmail.com wrote: but it is introducing two new build warnings: drivers/staging/sm750fb/sm750_hw.c: In function ‘hw_sm750_map’: drivers/staging/sm750fb/sm750_hw.c:67:2: warning: passing argument 1 of ‘ddk750_set_mmio’ discards ‘volatile’ qualifier from pointer target type [enabled by default] In file included from drivers/staging/sm750fb/ddk750_mode.h:4:0, from drivers/staging/sm750fb/ddk750.h:15, from drivers/staging/sm750fb/sm750_hw.c:24: and drivers/staging/sm750fb/ddk750_chip.h:77:6: note: expected ‘void *’ but argument is of type ‘volatile unsigned char *’ care to make another patch to solve these two new warnings, and send this patch and the new one in a series and while sending mark the version number in the subject. I think the second warning is simply additional information attached to the 1st to give context? I noticed this issue but felt changing the type of this field would sit outside the purview of this patch as then I'm not only changing the type of mmio750 and code that *directly* interacts with this variable, but also code that indirectly interacts with it, so I felt that should perhaps be a separate patch. I'd love to additionally provide some further patches to help out with issues here too, incidentally! I will try to prepare some further patches tonight in this vein. -- Lorenzo Stoakes https:/ljs.io ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/4] staging/lustre: checkpatch cleanup: macros should not use a trailing semicolon
OK, thanks, I'll fix it. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 2/3 v3] hyperv: hyperv_fb.c: match wait_for_completion_timeout return type
On 29/01/15 12:24, Nicholas Mc Guire wrote: The return type of wait_for_completion_timeout is unsigned long not int. This patch fixes up the declarations only. Signed-off-by: Nicholas Mc Guire der.h...@hofr.at --- v2: fixed subject line v3: fixed patch description as recommended by Dan Carpenter dan.carpen...@oracle.com Patch was compile tested only for x86_64_defconfig + CONFIG_X86_VSMP=y CONFIG_HYPERV=m, CONFIG_FB_HYPERV=m Patch is against 3.19.0-rc5 -next-20150123 drivers/video/fbdev/hyperv_fb.c |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c index 4254336..807ee22 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c @@ -415,7 +415,8 @@ static int synthvid_negotiate_ver(struct hv_device *hdev, u32 ver) struct fb_info *info = hv_get_drvdata(hdev); struct hvfb_par *par = info-par; struct synthvid_msg *msg = (struct synthvid_msg *)par-init_buf; - int t, ret = 0; + int ret = 0; + unsigned long t; memset(msg, 0, sizeof(struct synthvid_msg)); msg-vid_hdr.type = SYNTHVID_VERSION_REQUEST; @@ -488,7 +489,8 @@ static int synthvid_send_config(struct hv_device *hdev) struct fb_info *info = hv_get_drvdata(hdev); struct hvfb_par *par = info-par; struct synthvid_msg *msg = (struct synthvid_msg *)par-init_buf; - int t, ret = 0; + int ret = 0; + unsigned long t; /* Send VRAM location */ memset(msg, 0, sizeof(struct synthvid_msg)); Thanks, queued for 4.1. Tomi signature.asc Description: OpenPGP digital signature ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 2/4] staging/lustre: use __printf(...) instead of its
Now the subjects don't make regards, dan carpenter ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/4] staging/lustre: checkpatch cleanup: macros should not use a trailing semicolon
On Tue, Mar 10, 2015 at 09:34:24AM -0300, Mario J. Rugiero wrote: Do you mean a description, or the diffstats? I thought it was enough to describe it in the cover letter, I'll fix it and resend, thank you. Cover letters don't end up in the changelog, and some people (myself included) never usually read the things unless they have questions about the patches. Your patches should be simple enough to stand alone on their own, no need for a complex description in a cover letter, so the descriptions in the patches need to convey what is happening and why they are needed. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/4] staging/lustre: checkpatch cleanup: macros should not use a trailing semicolon
Do you mean a description, or the diffstats? I thought it was enough to describe it in the cover letter, I'll fix it and resend, thank you. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: sm750fb: Cleanup the type of mmio750
On Tue, Mar 10, 2015 at 02:40:30PM +0300, Dan Carpenter wrote: On Tue, Mar 10, 2015 at 09:57:06AM +, Lorenzo Stoakes wrote: This patch assigns the more appropriate void* type to the mmio750 variable eliminating an unnecessary volatile qualifier in the process. Additionally it updates parameter types as necessary where those parameters interact with mmio750 and removes unnecessary casts. As a consequence, this patch fixes the following sparse warning:- drivers/staging/sm750fb/ddk750_help.c:12:17: warning: incorrect type in assignment (different address spaces) Signed-off-by: Lorenzo Stoakes lstoa...@gmail.com Looks good. Thanks for doing this. but it is introducing two new build warnings: drivers/staging/sm750fb/sm750_hw.c: In function ‘hw_sm750_map’: drivers/staging/sm750fb/sm750_hw.c:67:2: warning: passing argument 1 of ‘ddk750_set_mmio’ discards ‘volatile’ qualifier from pointer target type [enabled by default] In file included from drivers/staging/sm750fb/ddk750_mode.h:4:0, from drivers/staging/sm750fb/ddk750.h:15, from drivers/staging/sm750fb/sm750_hw.c:24: and drivers/staging/sm750fb/ddk750_chip.h:77:6: note: expected ‘void *’ but argument is of type ‘volatile unsigned char *’ care to make another patch to solve these two new warnings, and send this patch and the new one in a series and while sending mark the version number in the subject. regards sudip regards, dan carpenter ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/4] staging/lustre: use __printf(...) instead of its
Substitute uses of __attribute__(format(printf(...)) by __printf(...),
as recommended by checkpatch.
Signed-off-by: Mario J. Rugiero mrugi...@gmail.com
---
drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h | 4 ++--
drivers/staging/lustre/lustre/include/lu_object.h | 2 +-
drivers/staging/lustre/lustre/include/lustre_dlm.h | 2 +-
drivers/staging/lustre/lustre/include/lustre_net.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
index 840dd1b..8251ac9 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
@@ -244,12 +244,12 @@ do {
\
int libcfs_debug_msg(struct libcfs_debug_msg_data *msgdata,
const char *format1, ...)
- __attribute__ ((format (printf, 2, 3)));
+ __printf(2, 3);
int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,
const char *format1,
va_list args, const char *format2, ...)
- __attribute__ ((format (printf, 4, 5)));
+ __printf(4, 5);
/* other external symbols that tracefile provides: */
int cfs_trace_copyin_string(char *knl_buffer, int knl_buffer_nob,
diff --git a/drivers/staging/lustre/lustre/include/lu_object.h
b/drivers/staging/lustre/lustre/include/lu_object.h
index fc3f234..7f8871e 100644
--- a/drivers/staging/lustre/lustre/include/lu_object.h
+++ b/drivers/staging/lustre/lustre/include/lu_object.h
@@ -192,7 +192,7 @@ struct lu_object_conf {
*/
typedef int (*lu_printer_t)(const struct lu_env *env,
void *cookie, const char *format, ...)
- __attribute__ ((format (printf, 3, 4)));
+ __printf(3, 4);
/**
* Operations specific for particular lu_object.
diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h
b/drivers/staging/lustre/lustre/include/lustre_dlm.h
index 6be6079..b682a60 100644
--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
@@ -1075,7 +1075,7 @@ extern char *ldlm_it2str(int it);
void _ldlm_lock_debug(struct ldlm_lock *lock,
struct libcfs_debug_msg_data *data,
const char *fmt, ...)
- __attribute__ ((format (printf, 3, 4)));
+ __printf(3, 4);
/**
* Rate-limited version of lock printing function.
diff --git a/drivers/staging/lustre/lustre/include/lustre_net.h
b/drivers/staging/lustre/lustre/include/lustre_net.h
index 36396d1..e2805bd 100644
--- a/drivers/staging/lustre/lustre/include/lustre_net.h
+++ b/drivers/staging/lustre/lustre/include/lustre_net.h
@@ -1673,7 +1673,7 @@ ptlrpc_rqphase2str(struct ptlrpc_request *req)
void _debug_req(struct ptlrpc_request *req,
struct libcfs_debug_msg_data *data, const char *fmt, ...)
- __attribute__ ((format (printf, 3, 4)));
+ __printf(3, 4);
/**
* Helper that decides if we need to print request according to current debug
--
2.3.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/4] staging/lustre: use __aligned(size) instead of the
Replace uses of __attribute__(aligned(size)) by __aligned(size), as
recommended by checkpatch.
Signed-off-by: Mario J. Rugiero mrugi...@gmail.com
---
drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
b/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
index f19a121..4688770 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
@@ -58,7 +58,7 @@ struct kuc_hdr {
__u8 kuc_flags;
__u16 kuc_msgtype;/* Message type or opcode, transport-specific */
__u16 kuc_msglen; /* Including header */
-} __attribute__((aligned(sizeof(__u64;
+} __aligned(sizeof(__u64));
#define KUC_CHANGELOG_MSG_MAXSIZE (sizeof(struct kuc_hdr)+CR_MAXSIZE)
--
2.3.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: sm750fb: Cleanup the type of mmio750
On Tue, Mar 10, 2015 at 12:47:44PM +, Lorenzo Stoakes wrote: On 10 March 2015 at 12:36, Sudip Mukherjee sudipm.mukher...@gmail.com wrote: but it is introducing two new build warnings: drivers/staging/sm750fb/sm750_hw.c: In function ‘hw_sm750_map’: drivers/staging/sm750fb/sm750_hw.c:67:2: warning: passing argument 1 of ‘ddk750_set_mmio’ discards ‘volatile’ qualifier from pointer target type [enabled by default] In file included from drivers/staging/sm750fb/ddk750_mode.h:4:0, from drivers/staging/sm750fb/ddk750.h:15, from drivers/staging/sm750fb/sm750_hw.c:24: and drivers/staging/sm750fb/ddk750_chip.h:77:6: note: expected ‘void *’ but argument is of type ‘volatile unsigned char *’ care to make another patch to solve these two new warnings, and send this patch and the new one in a series and while sending mark the version number in the subject. I think the second warning is simply additional information attached to the 1st to give context? I noticed this issue but felt changing the type of this field would sit outside the purview of this patch as then I'm not only changing the type of mmio750 and code that *directly* interacts with this variable, but also code that indirectly interacts with it, so I felt that should perhaps be a separate patch. You should have said that in the patch description or under the --- cut off. But anyway, it's not ok. And we'll need to redo this patch. Breaking up patches into logical changes is sort of tricky because everything touches everything else so the patch gets larger and larger. You could maybe break it up: [patch 1/2] staging: sm750fb: Cleanup the type of mmio750 This would add some temporary casting until the rest of the code was cleaned up. It wouldn't touch change the function parameters of ddk750_set_mmio(). [patch 2/2] staging: sm750fb: Cleanup the types for ddk750_set_mmio() This would change the function paramters and the type for -pvReg and remove the temporary casts. But maybe it's only one line larger than the patch you just send? In that case just fold it in and don't do the temporary casting. The next patch after that could get rid of all the ramaining volatile keywords. regards, dan carpenter ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: sm750fb: Cleanup the type of mmio750
On 10 March 2015 at 13:06, Dan Carpenter dan.carpen...@oracle.com wrote: You should have said that in the patch description or under the --- cut off. But anyway, it's not ok. And we'll need to redo this patch. Breaking up patches into logical changes is sort of tricky because everything touches everything else so the patch gets larger and larger. Major apologies, I am still getting used to kernel development! I'll be careful to not make such assumptions in future when it comes to warnings/errors. [snip] But maybe it's only one line larger than the patch you just send? In that case just fold it in and don't do the temporary casting. The next patch after that could get rid of all the ramaining volatile keywords. It seems that we can in fact fix this problem with a single additional change, I will submit a v2 shortly. Best, -- Lorenzo Stoakes https:/ljs.io ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/4] staging/lustre: clean trailing semicolon in macros
Cleanup trailing semicolons in macros, as recommended by cleanpatch.
Signed-off-by: Mario J. Rugiero mrugi...@gmail.com
---
drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h | 2 +-
drivers/staging/lustre/include/linux/libcfs/libcfs_private.h | 4 ++--
drivers/staging/lustre/lustre/include/lprocfs_status.h | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
index 2e5a9e5..840dd1b 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
@@ -196,7 +196,7 @@ do {
\
.msg_fn = __func__, \
.msg_line = __LINE__, \
.msg_cdls = (cdls) }; \
- dataname.msg_mask = (mask);
+ dataname.msg_mask = (mask)
/**
* Filters out logging messages based on mask and subsystem.
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
index ac9238a..515a54e 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
@@ -317,8 +317,8 @@ do {
\
#define LASSERT_ATOMIC_ZERO(a) LASSERT_ATOMIC_EQ(a, 0)
#define LASSERT_ATOMIC_POS(a) LASSERT_ATOMIC_GT(a, 0)
-#define CFS_ALLOC_PTR(ptr) LIBCFS_ALLOC(ptr, sizeof(*(ptr)));
-#define CFS_FREE_PTR(ptr) LIBCFS_FREE(ptr, sizeof(*(ptr)));
+#define CFS_ALLOC_PTR(ptr) LIBCFS_ALLOC(ptr, sizeof(*(ptr)))
+#define CFS_FREE_PTR(ptr) LIBCFS_FREE(ptr, sizeof(*(ptr)))
/*
* percpu partition lock
diff --git a/drivers/staging/lustre/lustre/include/lprocfs_status.h
b/drivers/staging/lustre/lustre/include/lprocfs_status.h
index 8a25cf6..d030847 100644
--- a/drivers/staging/lustre/lustre/include/lprocfs_status.h
+++ b/drivers/staging/lustre/lustre/include/lprocfs_status.h
@@ -679,7 +679,7 @@ extern int lprocfs_seq_release(struct inode *, struct file
*);
} \
} while (0)
#define LPROCFS_CLIMP_EXIT(obd) \
- up_read((obd)-u.cli.cl_sem);
+ up_read((obd)-u.cli.cl_sem)
/* write the name##_seq_show function, call LPROC_SEQ_FOPS_RO for read-only
@@ -723,7 +723,7 @@ static struct file_operations name##_fops = {
\
return lprocfs_wr_##type(file, buffer, \
count, seq-private); \
} \
- LPROC_SEQ_FOPS(name##_##type);
+ LPROC_SEQ_FOPS(name##_##type)
#define LPROC_SEQ_FOPS_WR_ONLY(name, type) \
static ssize_t name##_##type##_write(struct file *file, \
@@ -740,7 +740,7 @@ static struct file_operations name##_fops = {
\
.open = name##_##type##_open, \
.write = name##_##type##_write,\
.release = lprocfs_single_release, \
- };
+ }
/* lproc_ptlrpc.c */
struct ptlrpc_request;
--
2.3.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 4/4] staging/lustre: use __packed instead of
Replace __attribute__(packed) by __packed, as recommended by checkpatch.
Signed-off-by: Mario J. Rugiero mrugi...@gmail.com
---
.../include/linux/libcfs/libcfs_kernelcomm.h | 2 +-
.../staging/lustre/include/linux/lnet/lib-types.h | 2 +-
.../lustre/lustre/include/lustre/lustre_idl.h | 44 +++---
.../lustre/lustre/include/lustre/lustre_user.h | 14 +++
4 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
b/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
index 4688770..a989d26 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
@@ -107,7 +107,7 @@ typedef struct lustre_kernelcomm {
__u32 lk_group;
__u32 lk_data;
__u32 lk_flags;
-} __attribute__((packed)) lustre_kernelcomm;
+} __packed lustre_kernelcomm;
/* Userspace methods */
int libcfs_ukuc_start(lustre_kernelcomm *l, int groups);
diff --git a/drivers/staging/lustre/include/linux/lnet/lib-types.h
b/drivers/staging/lustre/include/linux/lnet/lib-types.h
index 50537668..feffca2 100644
--- a/drivers/staging/lustre/include/linux/lnet/lib-types.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-types.h
@@ -48,7 +48,7 @@
#include linux/list.h
#include types.h
-#define WIRE_ATTR __attribute__((packed))
+#define WIRE_ATTR __packed
/* Packed version of lnet_process_id_t to transfer via network */
typedef struct {
diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
index 5382bf4..0553043 100644
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
@@ -2954,7 +2954,7 @@ typedef enum {
struct llog_logid {
struct ost_id lgl_oi;
__u32 lgl_ogen;
-} __attribute__((packed));
+} __packed;
/** Records written to the CATALOGS list */
#define CATLIST CATALOGS
@@ -2963,7 +2963,7 @@ struct llog_catid {
__u32 lci_padding1;
__u32 lci_padding2;
__u32 lci_padding3;
-} __attribute__((packed));
+} __packed;
/* Log data record types - there is no specific reason that these need to
* be related to the RPC opcodes, but no reason not to (may be handy later?)
@@ -3027,7 +3027,7 @@ struct llog_logid_rec {
__u64 lid_padding2;
__u64 lid_padding3;
struct llog_rec_taillid_tail;
-} __attribute__((packed));
+} __packed;
struct llog_unlink_rec {
struct llog_rec_hdr lur_hdr;
@@ -3035,7 +3035,7 @@ struct llog_unlink_rec {
__u32 lur_oseq;
__u32 lur_count;
struct llog_rec_taillur_tail;
-} __attribute__((packed));
+} __packed;
struct llog_unlink64_rec {
struct llog_rec_hdr lur_hdr;
@@ -3045,7 +3045,7 @@ struct llog_unlink64_rec {
__u64 lur_padding2;
__u64 lur_padding3;
struct llog_rec_taillur_tail;
-} __attribute__((packed));
+} __packed;
struct llog_setattr64_rec {
struct llog_rec_hdr lsr_hdr;
@@ -3056,7 +3056,7 @@ struct llog_setattr64_rec {
__u32 lsr_gid_h;
__u64 lsr_padding;
struct llog_rec_taillsr_tail;
-} __attribute__((packed));
+} __packed;
struct llog_size_change_rec {
struct llog_rec_hdr lsc_hdr;
@@ -3066,7 +3066,7 @@ struct llog_size_change_rec {
__u64 lsc_padding2;
__u64 lsc_padding3;
struct llog_rec_taillsc_tail;
-} __attribute__((packed));
+} __packed;
#define CHANGELOG_MAGIC 0xca103000
@@ -3083,20 +3083,20 @@ struct llog_size_change_rec {
struct changelog_setinfo {
__u64 cs_recno;
__u32 cs_id;
-} __attribute__((packed));
+} __packed;
/** changelog record */
struct llog_changelog_rec {
struct llog_rec_hdr cr_hdr;
struct changelog_rec cr;
struct llog_rec_tail cr_tail; /** for_sizezof_only */
-} __attribute__((packed));
+} __packed;
struct llog_changelog_ext_rec {
struct llog_rec_hdr cr_hdr;
struct changelog_ext_rec cr;
struct llog_rec_tail cr_tail; /** for_sizezof_only */
-} __attribute__((packed));
+} __packed;
#define CHANGELOG_USER_PREFIX cl
@@ -3106,7 +3106,7 @@ struct llog_changelog_user_rec {
__u32cur_padding;
__u64cur_endrec;
struct llog_rec_tail cur_tail;
-} __attribute__((packed));
+} __packed;
enum agent_req_status {
ARS_WAITING,
@@ -3152,13 +3152,13 @@ struct llog_agent_req_rec {
__u64 arr_req_change; /** req. status change time */
struct hsm_action_item arr_hai;/** req. to the
[PATCH 0/4] staging/lustre: checkpatch cleanup
This patches cleans the following checkpatch issues: trailing semicolons in macros __attribute__(format(printf,...)) instead of __printf(...) __attribute__(aligned(size)) instead of __aligned(size) __attribute__(packed) instead of __packed Mario J. Rugiero (4): staging/lustre: checkpatch cleanup: macros should not use a trailing semicolon staging/lustre: checkpatch cleanup: __printf(string-index, first-to-check) is preferred over __attribute__((format(printf, string-index, first-to-check))) staging/lustre: checkpatch cleanup: __aligned(size) is preferred over __attribute__((aligned(size))) staging/lustre: checkpatch cleanup: __packed is preferred over __attribute__((packed)) .../lustre/include/linux/libcfs/libcfs_debug.h | 6 +-- .../include/linux/libcfs/libcfs_kernelcomm.h | 4 +- .../lustre/include/linux/libcfs/libcfs_private.h | 4 +- .../staging/lustre/include/linux/lnet/lib-types.h | 2 +- .../staging/lustre/lustre/include/lprocfs_status.h | 6 +-- drivers/staging/lustre/lustre/include/lu_object.h | 2 +- .../lustre/lustre/include/lustre/lustre_idl.h | 44 +++--- .../lustre/lustre/include/lustre/lustre_user.h | 14 +++ drivers/staging/lustre/lustre/include/lustre_dlm.h | 2 +- drivers/staging/lustre/lustre/include/lustre_net.h | 2 +- 10 files changed, 43 insertions(+), 43 deletions(-) -- 2.3.2 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2] staging: sm750fb: Cleanup the type of mmio750
This patch assigns the more appropriate void* type to the mmio750 variable
eliminating an unnecessary volatile qualifier in the process. Additionally it
updates parameter types as necessary where those parameters interact with
mmio750, removes unnecessary casts and updates the type of the
lynx_share-pvReg field which is passed to the ddk750_set_mmio method.
As a consequence, this patch fixes the following sparse warning:-
drivers/staging/sm750fb/ddk750_help.c:12:17: warning: incorrect type in
assignment (different address spaces)
Signed-off-by: Lorenzo Stoakes lstoa...@gmail.com
---
drivers/staging/sm750fb/ddk750_chip.h | 4 +++-
drivers/staging/sm750fb/ddk750_help.c | 4 ++--
drivers/staging/sm750fb/ddk750_help.h | 10 +-
drivers/staging/sm750fb/sm750.h | 2 +-
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_chip.h
b/drivers/staging/sm750fb/ddk750_chip.h
index 1c78875..d067b06 100644
--- a/drivers/staging/sm750fb/ddk750_chip.h
+++ b/drivers/staging/sm750fb/ddk750_chip.h
@@ -3,6 +3,8 @@
#define DEFAULT_INPUT_CLOCK 14318181 /* Default reference clock */
#define SM750LE_REVISION_ID (char)0xfe
+#include linux/io.h
+
/* This is all the chips recognized by this library */
typedef enum _logical_chip_type_t
{
@@ -70,7 +72,7 @@ logical_chip_type_t getChipType(void);
unsigned int calcPllValue(unsigned int request,pll_value_t *pll);
unsigned int calcPllValue2(unsigned int,pll_value_t *);
unsigned int formatPllReg(pll_value_t *pPLL);
-void ddk750_set_mmio(volatile unsigned char *,unsigned short,char);
+void ddk750_set_mmio(void __iomem *,unsigned short,char);
unsigned int ddk750_getVMSize(void);
int ddk750_initHw(initchip_param_t *);
unsigned int getPllValue(clock_type_t clockType, pll_value_t *pPLL);
diff --git a/drivers/staging/sm750fb/ddk750_help.c
b/drivers/staging/sm750fb/ddk750_help.c
index cc00d2b..c68ff3b 100644
--- a/drivers/staging/sm750fb/ddk750_help.c
+++ b/drivers/staging/sm750fb/ddk750_help.c
@@ -2,12 +2,12 @@
//#include ddk750_chip.h
#include ddk750_help.h
-volatile unsigned char __iomem * mmio750 = NULL;
+void __iomem * mmio750 = NULL;
char revId750 = 0;
unsigned short devId750 = 0;
/* after driver mapped io registers, use this function first */
-void ddk750_set_mmio(volatile unsigned char * addr,unsigned short devId,char
revId)
+void ddk750_set_mmio(void __iomem * addr,unsigned short devId,char revId)
{
mmio750 = addr;
devId750 = devId;
diff --git a/drivers/staging/sm750fb/ddk750_help.h
b/drivers/staging/sm750fb/ddk750_help.h
index 4fc93b5..07c8264 100644
--- a/drivers/staging/sm750fb/ddk750_help.h
+++ b/drivers/staging/sm750fb/ddk750_help.h
@@ -12,14 +12,14 @@
#if 0
/* if 718 big endian turned on,be aware that don't use this driver for general
use,only for ppc big-endian */
#warning big endian on target cpu and enable nature big endian support of 718
capability !
-#define PEEK32(addr) __raw_readl((void __iomem
*)(mmio750)+(addr))
-#define POKE32(addr,data) __raw_writel((data),(void
__iomem*)(mmio750)+(addr))
+#define PEEK32(addr) __raw_readl(mmio750 + addr)
+#define POKE32(addr,data) __raw_writel(data, mmio750 + addr)
#else /* software control endianess */
-#define PEEK32(addr) readl((addr)+mmio750)
-#define POKE32(addr,data) writel((data),(addr)+mmio750)
+#define PEEK32(addr) readl(addr + mmio750)
+#define POKE32(addr,data) writel(data, addr + mmio750)
#endif
-extern volatile unsigned char __iomem * mmio750;
+extern void __iomem * mmio750;
extern char revId750;
extern unsigned short devId750;
#else
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index 711676c..376df5f 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -63,7 +63,7 @@ struct lynx_share{
resource_size_t vidreg_start;
resource_size_t vidmem_size;
resource_size_t vidreg_size;
- volatile unsigned char __iomem * pvReg;
+ void __iomem * pvReg;
unsigned char __iomem * pvMem;
/* locks*/
spinlock_t slock;
--
2.3.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] SCSI:STORVSC Use SCSI layer to allocate memory for per-command device request data
On Tue, Mar 10, 2015 at 12:42:33PM +0100, Olaf Hering wrote: It would be nice to change .proc_name to KBUILD_MODNAME before v4.0 is released. We carry a patch which adds this field. Of cource we can just change the patch, but if code gets touched upstream anyway... Please send a patch. Would be nice if you had sent it long go insted of just including it in a vendor tree.. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 6/6] staging: sm750fb: Spinlock and unlock in the same block
This patch combines spinlock locks and unlocks together in the same block rather
than occurring in separate blocks preventing a possible deadlock. This fixes the
following sparse warnings:-
drivers/staging/sm750fb/sm750.c:218:22: warning: context imbalance in
'lynxfb_ops_fillrect' - different lock contexts for basic block
drivers/staging/sm750fb/sm750.c:241:22: warning: context imbalance in
'lynxfb_ops_copyarea' - different lock contexts for basic block
drivers/staging/sm750fb/sm750.c:282:22: warning: context imbalance in
'lynxfb_ops_imageblit' - different lock contexts for basic block
Unfortunately this change involves code (and comment) duplication.
Signed-off-by: Lorenzo Stoakes lstoa...@gmail.com
---
drivers/staging/sm750fb/sm750.c | 76 +++--
1 file changed, 43 insertions(+), 33 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 3e36b6a..58c7518 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -56,23 +56,6 @@ static char * g_settings = NULL;
static int g_dualview = 0;
static char * g_option = NULL;
-/* if not use spin_lock,system will die if user load driver
- * and immediatly unload driver frequently (dual)*/
-static inline void myspin_lock(spinlock_t * sl){
- struct lynx_share * share;
- share = container_of(sl,struct lynx_share,slock);
- if(share-dual){
- spin_lock(sl);
- }
-}
-
-static inline void myspin_unlock(spinlock_t * sl){
- struct lynx_share * share;
- share = container_of(sl,struct lynx_share,slock);
- if(share-dual){
- spin_unlock(sl);
- }
-}
static const struct fb_videomode lynx750_ext[] = {
/* 1024x600-60 VESA[1.71:1]*/
{NULL, 60, 1024, 600, 20423, 144, 40, 18, 1, 104, 3,
@@ -209,13 +192,22 @@ static void lynxfb_ops_fillrect(struct fb_info*
info,const struct fb_fillrect* r
color = (Bpp ==
1)?region-color:((u32*)info-pseudo_palette)[region-color];
rop = ( region-rop != ROP_COPY ) ? HW_ROP2_XOR:HW_ROP2_COPY;
- myspin_lock(share-slock);
- share-accel.de_fillrect(share-accel,
- base,pitch,Bpp,
- region-dx,region-dy,
-
region-width,region-height,
- color,rop);
- myspin_unlock(share-slock);
+ /* if not use spin_lock,system will die if user load driver
+* and immediatly unload driver frequently (dual)*/
+ if (share-dual) {
+ spin_lock(share-slock);
+ share-accel.de_fillrect(share-accel,
+ base,pitch,Bpp,
+ region-dx,region-dy,
+ region-width,region-height,
+ color,rop);
+ spin_unlock(share-slock);
+ } else
+ share-accel.de_fillrect(share-accel,
+ base,pitch,Bpp,
+ region-dx,region-dy,
+ region-width,region-height,
+ color,rop);
}
static void lynxfb_ops_copyarea(struct fb_info * info,const struct fb_copyarea
* region)
@@ -233,12 +225,20 @@ static void lynxfb_ops_copyarea(struct fb_info *
info,const struct fb_copyarea *
pitch = info-fix.line_length;
Bpp = info-var.bits_per_pixel 3;
- myspin_lock(share-slock);
- share-accel.de_copyarea(share-accel,
-
base,pitch,region-sx,region-sy,
-
base,pitch,Bpp,region-dx,region-dy,
-
region-width,region-height,HW_ROP2_COPY);
- myspin_unlock(share-slock);
+ /* if not use spin_lock,system will die if user load driver
+* and immediatly unload driver frequently (dual)*/
+ if (share-dual) {
+ spin_lock(share-slock);
+ share-accel.de_copyarea(share-accel,
+ base,pitch,region-sx,region-sy,
+ base,pitch,Bpp,region-dx,region-dy,
+
region-width,region-height,HW_ROP2_COPY);
+ spin_unlock(share-slock);
+ } else
+ share-accel.de_copyarea(share-accel,
+ base,pitch,region-sx,region-sy,
+ base,pitch,Bpp,region-dx,region-dy,
+
region-width,region-height,HW_ROP2_COPY);
}
static void lynxfb_ops_imageblit(struct fb_info*info,const struct fb_image*
image)
@@ -272,14 +272,24 @@ static void
[PATCH 2/6] staging: sm750fb: Fix non-ANSI function declarations
Fixes Function declarations which expect no parameters to have a parameter list
consisting of void. This fixes the following sparse warnings:-
drivers/staging/sm750fb/sm750_hw.c:584:23: warning: non-ANSI function
declaration of function 'hw_sm750le_deWait'
drivers/staging/sm750fb/sm750_hw.c:601:21: warning: non-ANSI function
declaration of function 'hw_sm750_deWait'
9,13d7
drivers/staging/sm750fb/ddk750_chip.c:14:33: warning: non-ANSI function
declaration of function 'getChipType'
drivers/staging/sm750fb/ddk750_chip.c:94:27: warning: non-ANSI function
declaration of function 'getChipClock'
drivers/staging/sm750fb/ddk750_chip.c:235:31: warning: non-ANSI function
declaration of function 'ddk750_getVMSize'
drivers/staging/sm750fb/ddk750_power.c:18:27: warning: non-ANSI function
declaration of function 'getPowerMode'
drivers/staging/sm750fb/ddk750_display.c:276:24: warning: non-ANSI function
declaration of function 'ddk750_initDVIDisp'
19,22d12
drivers/staging/sm750fb/ddk750_sii164.c:37:34: warning: non-ANSI function
declaration of function 'sii164GetVendorID'
drivers/staging/sm750fb/ddk750_sii164.c:54:34: warning: non-ANSI function
declaration of function 'sii164GetDeviceID'
drivers/staging/sm750fb/ddk750_dvi.c:65:31: warning: non-ANSI function
declaration of function 'dviGetVendorID'
drivers/staging/sm750fb/ddk750_dvi.c:85:31: warning: non-ANSI function
declaration of function 'dviGetDeviceID'
Signed-off-by: Lorenzo Stoakes lstoa...@gmail.com
---
drivers/staging/sm750fb/ddk750_chip.c| 6 +++---
drivers/staging/sm750fb/ddk750_display.c | 2 +-
drivers/staging/sm750fb/ddk750_dvi.c | 4 ++--
drivers/staging/sm750fb/ddk750_power.c | 2 +-
drivers/staging/sm750fb/ddk750_sii164.c | 4 ++--
drivers/staging/sm750fb/sm750_hw.c | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_chip.c
b/drivers/staging/sm750fb/ddk750_chip.c
index b71169e..3c77207 100644
--- a/drivers/staging/sm750fb/ddk750_chip.c
+++ b/drivers/staging/sm750fb/ddk750_chip.c
@@ -11,7 +11,7 @@ typedef struct _pllcalparam{
pllcalparam;
-logical_chip_type_t getChipType()
+logical_chip_type_t getChipType(void)
{
unsigned short physicalID;
char physicalRev;
@@ -91,7 +91,7 @@ unsigned int getPllValue(clock_type_t clockType, pll_value_t
*pPLL)
}
-unsigned int getChipClock()
+unsigned int getChipClock(void)
{
pll_value_t pll;
#if 1
@@ -232,7 +232,7 @@ void setMasterClock(unsigned int frequency)
}
-unsigned int ddk750_getVMSize()
+unsigned int ddk750_getVMSize(void)
{
unsigned int reg;
unsigned int data;
diff --git a/drivers/staging/sm750fb/ddk750_display.c
b/drivers/staging/sm750fb/ddk750_display.c
index a282a94..c84196a 100644
--- a/drivers/staging/sm750fb/ddk750_display.c
+++ b/drivers/staging/sm750fb/ddk750_display.c
@@ -273,7 +273,7 @@ void ddk750_setLogicalDispOut(disp_output_t output)
}
-int ddk750_initDVIDisp()
+int ddk750_initDVIDisp(void)
{
/* Initialize DVI. If the dviInit fail and the VendorID or the DeviceID are
not zeroed, then set the failure flag. If it is zeroe, it might mean
diff --git a/drivers/staging/sm750fb/ddk750_dvi.c
b/drivers/staging/sm750fb/ddk750_dvi.c
index 1c083e7..f5932bb 100644
--- a/drivers/staging/sm750fb/ddk750_dvi.c
+++ b/drivers/staging/sm750fb/ddk750_dvi.c
@@ -62,7 +62,7 @@ int dviInit(
* Output:
* Vendor ID
*/
-unsigned short dviGetVendorID()
+unsigned short dviGetVendorID(void)
{
dvi_ctrl_device_t *pCurrentDviCtrl;
@@ -82,7 +82,7 @@ unsigned short dviGetVendorID()
* Output:
* Device ID
*/
-unsigned short dviGetDeviceID()
+unsigned short dviGetDeviceID(void)
{
dvi_ctrl_device_t *pCurrentDviCtrl;
diff --git a/drivers/staging/sm750fb/ddk750_power.c
b/drivers/staging/sm750fb/ddk750_power.c
index 98dfcbd..cbb9767 100644
--- a/drivers/staging/sm750fb/ddk750_power.c
+++ b/drivers/staging/sm750fb/ddk750_power.c
@@ -15,7 +15,7 @@ void ddk750_setDPMS(DPMS_t state)
}
}
-unsigned int getPowerMode()
+unsigned int getPowerMode(void)
{
if(getChipType() == SM750LE)
return 0;
diff --git a/drivers/staging/sm750fb/ddk750_sii164.c
b/drivers/staging/sm750fb/ddk750_sii164.c
index faf8250..bdd7742 100644
--- a/drivers/staging/sm750fb/ddk750_sii164.c
+++ b/drivers/staging/sm750fb/ddk750_sii164.c
@@ -34,7 +34,7 @@ static char *gDviCtrlChipName = Silicon Image SiI 164;
* Output:
* Vendor ID
*/
-unsigned short sii164GetVendorID()
+unsigned short sii164GetVendorID(void)
{
unsigned short vendorID;
@@ -51,7 +51,7 @@ unsigned short sii164GetVendorID()
* Output:
* Device ID
*/
-unsigned short sii164GetDeviceID()
+unsigned short sii164GetDeviceID(void)
{
unsigned short deviceID;
diff --git a/drivers/staging/sm750fb/sm750_hw.c
b/drivers/staging/sm750fb/sm750_hw.c
index c44a50b..3050847 100644
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@
[PATCH 5/6] staging: sm750fb: Fix __iomem pointer types
This patch annotates pointers as referring to I/O mapped memory where they ought
to be, removes now unnecessary ugly casts, eliminates an incorrect deref on I/O
mapped memory by using iowrite16 instead, and updates the pointer arithmetic
accordingly to take into account that the pointers are now byte-sized. This
fixes the following sparse warnings:-
drivers/staging/sm750fb/sm750_cursor.c:113:19: warning: cast removes address
space of expression
drivers/staging/sm750fb/sm750_cursor.c:204:19: warning: cast removes address
space of expression
Signed-off-by: Lorenzo Stoakes lstoa...@gmail.com
---
drivers/staging/sm750fb/sm750_cursor.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750_cursor.c
b/drivers/staging/sm750fb/sm750_cursor.c
index 6cceef1..c2ff3bd 100644
--- a/drivers/staging/sm750fb/sm750_cursor.c
+++ b/drivers/staging/sm750fb/sm750_cursor.c
@@ -98,7 +98,7 @@ void hw_cursor_setData(struct lynx_cursor * cursor,
int i,j,count,pitch,offset;
u8 color,mask,opr;
u16 data;
- u16 * pbuffer,*pstart;
+ void __iomem * pbuffer,*pstart;
/* in byte*/
pitch = cursor-w 3;
@@ -106,11 +106,11 @@ void hw_cursor_setData(struct lynx_cursor * cursor,
/* in byte */
count = pitch * cursor-h;
- /* in ushort */
- offset = cursor-maxW * 2 / 8 / 2;
+ /* in byte */
+ offset = cursor-maxW * 2 / 8;
data = 0;
- pstart = (u16 *)cursor-vstart;
+ pstart = cursor-vstart;
pbuffer = pstart;
/*
@@ -161,7 +161,7 @@ void hw_cursor_setData(struct lynx_cursor * cursor,
}
}
#endif
- *pbuffer = data;
+ iowrite16(data, pbuffer);
/* assume pitch is 1,2,4,8,...*/
#if 0
@@ -174,7 +174,7 @@ void hw_cursor_setData(struct lynx_cursor * cursor,
pstart += offset;
pbuffer = pstart;
}else{
- pbuffer++;
+ pbuffer += sizeof(u16);
}
}
@@ -189,7 +189,7 @@ void hw_cursor_setData2(struct lynx_cursor * cursor,
int i,j,count,pitch,offset;
u8 color, mask;
u16 data;
- u16 * pbuffer,*pstart;
+ void __iomem * pbuffer,*pstart;
/* in byte*/
pitch = cursor-w 3;
@@ -197,11 +197,11 @@ void hw_cursor_setData2(struct lynx_cursor * cursor,
/* in byte */
count = pitch * cursor-h;
- /* in ushort */
- offset = cursor-maxW * 2 / 8 / 2;
+ /* in byte */
+ offset = cursor-maxW * 2 / 8;
data = 0;
- pstart = (u16 *)cursor-vstart;
+ pstart = cursor-vstart;
pbuffer = pstart;
for(i=0;icount;i++)
@@ -234,7 +234,7 @@ void hw_cursor_setData2(struct lynx_cursor * cursor,
data |= ((color (1j))?1:2)(j*2);
}
#endif
- *pbuffer = data;
+ iowrite16(data, pbuffer);
/* assume pitch is 1,2,4,8,...*/
if(!(i(pitch-1)))
@@ -244,7 +244,7 @@ void hw_cursor_setData2(struct lynx_cursor * cursor,
pstart += offset;
pbuffer = pstart;
}else{
- pbuffer++;
+ pbuffer += sizeof(u16);
}
}
--
2.3.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 4/6] staging: sm750fb: Expose hw712_fillrect externally
This patch adds a reference to hw712_fillrect which is not used elsewhere in the driver, but appears to be an alternative to the hw_fillrect method. This patch fixes the following sparse warning:- drivers/staging/sm750fb/sm750_accel.c:95:5: warning: symbol 'hw712_fillrect' was not declared. Should it be static? Signed-off-by: Lorenzo Stoakes lstoa...@gmail.com --- drivers/staging/sm750fb/sm750_accel.c | 2 +- drivers/staging/sm750fb/sm750_accel.h | 7 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/staging/sm750fb/sm750_accel.c b/drivers/staging/sm750fb/sm750_accel.c index 4aa763b..6521c3b 100644 --- a/drivers/staging/sm750fb/sm750_accel.c +++ b/drivers/staging/sm750fb/sm750_accel.c @@ -92,7 +92,7 @@ void hw_set2dformat(struct lynx_accel * accel,int fmt) /* seems sm712 RectFill command is broken,so need use BitBlt to * replace it. */ -static int hw712_fillrect(struct lynx_accel * accel, +int hw712_fillrect(struct lynx_accel * accel, u32 base,u32 pitch,u32 Bpp, u32 x,u32 y,u32 width,u32 height, u32 color,u32 rop) diff --git a/drivers/staging/sm750fb/sm750_accel.h b/drivers/staging/sm750fb/sm750_accel.h index 3ee0bd8..51a9367 100644 --- a/drivers/staging/sm750fb/sm750_accel.h +++ b/drivers/staging/sm750fb/sm750_accel.h @@ -238,11 +238,16 @@ void hw_set2dformat(struct lynx_accel * accel,int fmt); void hw_de_init(struct lynx_accel * accel); +int hw712_fillrect(struct lynx_accel * accel, + u32 base,u32 pitch,u32 Bpp, + u32 x,u32 y,u32 width,u32 height, + u32 color,u32 rop); + int hw_fillrect(struct lynx_accel * accel, u32 base,u32 pitch,u32 Bpp, u32 x,u32 y,u32 width,u32 height, u32 color,u32 rop); int hw_copyarea( struct lynx_accel * accel, unsigned int sBase, /* Address of source: offset in frame buffer */ -- 2.3.2 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/6] staging: sm750fb: Make internal functions static
This patch declares externally unavailable functions static. This fixes the
following sparse warnings:-
drivers/staging/sm750fb/ddk750_swi2c.c:223:6: warning: symbol 'swI2CStart' was
not declared. Should it be static?
drivers/staging/sm750fb/ddk750_swi2c.c:234:6: warning: symbol 'swI2CStop' was
not declared. Should it be static?
drivers/staging/sm750fb/ddk750_swi2c.c:252:6: warning: symbol 'swI2CWriteByte'
was not declared. Should it be static?
drivers/staging/sm750fb/ddk750_swi2c.c:320:15: warning: symbol 'swI2CReadByte'
was not declared. Should it be static?
drivers/staging/sm750fb/ddk750_swi2c.c:361:6: warning: symbol
'swI2CInit_SM750LE' was not declared. Should it be static?
drivers/staging/sm750fb/ddk750_hwi2c.c:63:6: warning: symbol 'hwI2CWaitTXDone'
was not declared. Should it be static?
drivers/staging/sm750fb/ddk750_hwi2c.c:93:14: warning: symbol 'hwI2CWriteData'
was not declared. Should it be static?
drivers/staging/sm750fb/ddk750_hwi2c.c:160:14: warning: symbol 'hwI2CReadData'
was not declared. Should it be static?
Signed-off-by: Lorenzo Stoakes lstoa...@gmail.com
---
drivers/staging/sm750fb/ddk750_hwi2c.c | 6 +++---
drivers/staging/sm750fb/ddk750_swi2c.c | 10 +-
drivers/staging/sm750fb/sm750_accel.c | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_hwi2c.c
b/drivers/staging/sm750fb/ddk750_hwi2c.c
index 84dfb6f..7826376 100644
--- a/drivers/staging/sm750fb/ddk750_hwi2c.c
+++ b/drivers/staging/sm750fb/ddk750_hwi2c.c
@@ -60,7 +60,7 @@ void hwI2CClose(void)
}
-long hwI2CWaitTXDone(void)
+static long hwI2CWaitTXDone(void)
{
unsigned int timeout;
@@ -90,7 +90,7 @@ long hwI2CWaitTXDone(void)
* Return Value:
* Total number of bytes those are actually written.
*/
-unsigned int hwI2CWriteData(
+static unsigned int hwI2CWriteData(
unsigned char deviceAddress,
unsigned int length,
unsigned char *pBuffer
@@ -157,7 +157,7 @@ unsigned int hwI2CWriteData(
* Return Value:
* Total number of actual bytes read from the slave device
*/
-unsigned int hwI2CReadData(
+static unsigned int hwI2CReadData(
unsigned char deviceAddress,
unsigned int length,
unsigned char *pBuffer
diff --git a/drivers/staging/sm750fb/ddk750_swi2c.c
b/drivers/staging/sm750fb/ddk750_swi2c.c
index 1249759..516f5bb 100644
--- a/drivers/staging/sm750fb/ddk750_swi2c.c
+++ b/drivers/staging/sm750fb/ddk750_swi2c.c
@@ -220,7 +220,7 @@ static void swI2CAck(void)
/*
* This function sends the start command to the slave device
*/
-void swI2CStart(void)
+static void swI2CStart(void)
{
/* Start I2C */
swI2CSDA(1);
@@ -231,7 +231,7 @@ void swI2CStart(void)
/*
* This function sends the stop command to the slave device
*/
-void swI2CStop(void)
+static void swI2CStop(void)
{
/* Stop the I2C */
swI2CSCL(1);
@@ -249,7 +249,7 @@ void swI2CStop(void)
* 0 - Success
* -1 - Fail to write byte
*/
-long swI2CWriteByte(unsigned char data)
+static long swI2CWriteByte(unsigned char data)
{
unsigned char value = data;
int i;
@@ -317,7 +317,7 @@ long swI2CWriteByte(unsigned char data)
* Return Value:
* One byte data read from the Slave device
*/
-unsigned char swI2CReadByte(unsigned char ack)
+static unsigned char swI2CReadByte(unsigned char ack)
{
int i;
unsigned char data = 0;
@@ -358,7 +358,7 @@ unsigned char swI2CReadByte(unsigned char ack)
* -1 - Fail to initialize the i2c
* 0 - Success
*/
-long swI2CInit_SM750LE(
+static long swI2CInit_SM750LE(
unsigned char i2cClkGPIO,
unsigned char i2cDataGPIO
)
diff --git a/drivers/staging/sm750fb/sm750_accel.c
b/drivers/staging/sm750fb/sm750_accel.c
index 6521c3b..4aa763b 100644
--- a/drivers/staging/sm750fb/sm750_accel.c
+++ b/drivers/staging/sm750fb/sm750_accel.c
@@ -92,7 +92,7 @@ void hw_set2dformat(struct lynx_accel * accel,int fmt)
/* seems sm712 RectFill command is broken,so need use BitBlt to
* replace it. */
-int hw712_fillrect(struct lynx_accel * accel,
+static int hw712_fillrect(struct lynx_accel * accel,
u32 base,u32 pitch,u32 Bpp,
u32 x,u32 y,u32 width,u32 height,
u32 color,u32 rop)
--
2.3.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/6] staging: sm750fb: Use memset_io instead of memset
This patch uses memset_io instead of memset when using memset on __iomem
qualified pointers. This fixes the following sparse warnings:-
drivers/staging/sm750fb/sm750.c:489:17: warning: incorrect type in argument 1
(different address spaces)
drivers/staging/sm750fb/sm750.c:490:17: warning: incorrect type in argument 1
(different address spaces)
drivers/staging/sm750fb/sm750.c:501:17: warning: incorrect type in argument 1
(different address spaces)
drivers/staging/sm750fb/sm750.c:502:17: warning: incorrect type in argument 1
(different address spaces)
drivers/staging/sm750fb/sm750.c:833:5: warning: incorrect type in argument 1
(different address spaces)
drivers/staging/sm750fb/sm750.c:1154:9: warning: incorrect type in argument 1
(different address spaces)
Signed-off-by: Lorenzo Stoakes lstoa...@gmail.com
---
drivers/staging/sm750fb/sm750.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index aa0888c..3e36b6a 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -486,8 +486,8 @@ static int lynxfb_resume(struct pci_dev* pdev)
par = info-par;
crtc = par-crtc;
cursor = crtc-cursor;
- memset(cursor-vstart, 0x0, cursor-size);
- memset(crtc-vScreen,0x0,crtc-vidmem_size);
+ memset_io(cursor-vstart, 0x0, cursor-size);
+ memset_io(crtc-vScreen,0x0,crtc-vidmem_size);
lynxfb_ops_set_par(info);
fb_set_suspend(info, 0);
}
@@ -498,8 +498,8 @@ static int lynxfb_resume(struct pci_dev* pdev)
par = info-par;
crtc = par-crtc;
cursor = crtc-cursor;
- memset(cursor-vstart, 0x0, cursor-size);
- memset(crtc-vScreen,0x0,crtc-vidmem_size);
+ memset_io(cursor-vstart, 0x0, cursor-size);
+ memset_io(crtc-vScreen,0x0,crtc-vidmem_size);
lynxfb_ops_set_par(info);
fb_set_suspend(info, 0);
}
@@ -830,7 +830,7 @@ static int lynxfb_set_fbinfo(struct fb_info* info,int index)
crtc-cursor.share = share;
-memset(crtc-cursor.vstart, 0, crtc-cursor.size);
+memset_io(crtc-cursor.vstart, 0, crtc-cursor.size);
if(!g_hwcursor){
lynxfb_ops.fb_cursor = NULL;
crtc-cursor.disable(crtc-cursor);
@@ -1151,7 +1151,7 @@ static int lynxfb_pci_probe(struct pci_dev * pdev,
}
#endif
- memset(share-pvMem,0,share-vidmem_size);
+ memset_io(share-pvMem,0,share-vidmem_size);
pr_info(sm%3x mmio address = %p\n,share-devid,share-pvReg);
--
2.3.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 00/56] staging: comedi: introduce comedi_pci.h header
On Tue, 2015-03-10 at 16:10 +, Ian Abbott wrote: comedidev.h includes PCI-specific stuff that gets included by all comedi drivers including non-PCI ones. Separate it out into its own header comedi_pci.h. Make the new header include linux/pci.h and comedidev.h so that comedi PCI drivers do not need to include them explicitly. Isn't the kernel progressing to avoid indirect includes? Perhaps it'd be nicer to move generic comedi .h files into a more common location and change the include path so that the include statements don't have to be relative? Maybe add an include/comedi/ directory? ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/6] staging: sm750fb: remove unused functions
removed the functions which were not used anywhere.
it has been build tested also confirmed with git grep that there is
no other reference of these functions.
Signed-off-by: Sudip Mukherjee su...@vectorindia.org
---
drivers/staging/sm750fb/ddk750_display.c | 11 --
drivers/staging/sm750fb/ddk750_swi2c.c | 8
drivers/staging/sm750fb/sm750.c | 65
3 files changed, 84 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_display.c
b/drivers/staging/sm750fb/ddk750_display.c
index 57192e5..a282a94 100644
--- a/drivers/staging/sm750fb/ddk750_display.c
+++ b/drivers/staging/sm750fb/ddk750_display.c
@@ -201,17 +201,6 @@ static void waitNextVerticalSync(int ctrl,int delay)
}
}
-static void swPanelPowerSequence_sm750le(int disp,int delay)
-{
- unsigned int reg;
- reg = PEEK32(DISPLAY_CONTROL_750LE);
- if(disp)
- reg |= 0xf;
- else
- reg = ~0xf;
- POKE32(DISPLAY_CONTROL_750LE,reg);
-}
-
static void swPanelPowerSequence(int disp,int delay)
{
unsigned int reg;
diff --git a/drivers/staging/sm750fb/ddk750_swi2c.c
b/drivers/staging/sm750fb/ddk750_swi2c.c
index cae6b9b..1249759 100644
--- a/drivers/staging/sm750fb/ddk750_swi2c.c
+++ b/drivers/staging/sm750fb/ddk750_swi2c.c
@@ -79,14 +79,6 @@ static unsigned long g_i2cDataGPIOMuxReg = GPIO_MUX;
static unsigned long g_i2cDataGPIODataReg = GPIO_DATA;
static unsigned long g_i2cDataGPIODataDirReg = GPIO_DATA_DIRECTION;
-static unsigned char peekIO(unsigned short port,unsigned short index)
-{
-#if defined(__i386__) || defined( __x86_64__)
- outb_p(index,port);
- return inb_p(port+1);
-#endif
-}
-
/*
* This function puts a delay between command
*/
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 8c260ee..87029b6 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -510,69 +510,6 @@ static int lynxfb_resume(struct pci_dev* pdev)
}
#endif
-static int lynxfb_ops_mmap(struct fb_info * info, struct vm_area_struct * vma)
-{
- unsigned long off;
- unsigned long start;
- u32 len;
- struct file *file;
-
- file = vma-vm_file;
-
- if (!info)
- return -ENODEV;
- if (vma-vm_pgoff (~0UL PAGE_SHIFT))
- return -EINVAL;
- off = vma-vm_pgoff PAGE_SHIFT;
- printk(lynxfb mmap pgoff: %lx\n, vma-vm_pgoff);
- printk(lynxfb mmap off 1: %lx\n, off);
-
- /* frame buffer memory */
- start = info-fix.smem_start;
- len = PAGE_ALIGN((start ~PAGE_MASK) + info-fix.smem_len);
-
- printk(lynxfb mmap start 1: %lx\n, start);
- printk(lynxfb mmap len 1: %x\n, len);
-
- if (off = len) {
- /* memory mapped io */
- off -= len;
- printk(lynxfb mmap off 2: %lx\n, off);
- if (info-var.accel_flags) {
- printk(lynxfb mmap accel flags true);
- return -EINVAL;
- }
- start = info-fix.mmio_start;
- len = PAGE_ALIGN((start ~PAGE_MASK) + info-fix.mmio_len);
-
- printk(lynxfb mmap start 2: %lx\n, start);
- printk(lynxfb mmap len 2: %x\n, len);
- }
- start = PAGE_MASK;
- printk(lynxfb mmap start 3: %lx\n, start);
- printk(lynxfb mmap vm start: %lx\n, vma-vm_start);
- printk(lynxfb mmap vm end: %lx\n, vma-vm_end);
- printk(lynxfb mmap len: %x\n, len);
- printk(lynxfb mmap off: %lx\n, off);
- if ((vma-vm_end - vma-vm_start + off) len)
- {
- return -EINVAL;
- }
- off += start;
- printk(lynxfb mmap off 3: %lx\n, off);
- vma-vm_pgoff = off PAGE_SHIFT;
- /* This is an IO map - tell maydump to skip this VMA */
- vma-vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
- vma-vm_page_prot = vm_get_page_prot(vma-vm_flags);
- fb_pgprotect(file, vma, off);
- printk(lynxfb mmap off 4: %lx\n, off);
- printk(lynxfb mmap pgprot: %lx\n, (unsigned long)
pgprot_val(vma-vm_page_prot));
- if (io_remap_pfn_range(vma, vma-vm_start, off PAGE_SHIFT,
-vma-vm_end - vma-vm_start, vma-vm_page_prot))
- return -EAGAIN;
- return 0;
-}
-
static int lynxfb_ops_check_var(struct fb_var_screeninfo* var,struct fb_info*
info)
{
struct lynxfb_par * par;
@@ -824,8 +761,6 @@ static struct fb_ops lynxfb_ops={
.fb_set_par = lynxfb_ops_set_par,
.fb_setcolreg = lynxfb_ops_setcolreg,
.fb_blank = lynxfb_ops_blank,
- /*.fb_mmap = lynxfb_ops_mmap,*/
- /* will be hooked by hardware */
.fb_fillrect = cfb_fillrect,
.fb_imageblit = cfb_imageblit,
.fb_copyarea = cfb_copyarea,
--
1.8.1.2
___
devel
[PATCH 0/6] staging: sm750fb: fixed all build warnings
Hi Greg, all the build warnings have been taken care of in this series. some of the patches will generate a few checkpatch warning and for some I tried to address few of the chcekpatch warnings while modifying them. regards sudip Sudip Mukherjee (6): staging: sm750fb: remove unused functions staging: sm750fb: remove unused variables staging: sm750fb: correct function return staging: sm750fb: correct incompatible pointer type staging: sm750fb: fix mixed declarations staging: sm750fb: correct integer comparison drivers/staging/sm750fb/ddk750_display.c | 11 - drivers/staging/sm750fb/ddk750_swi2c.c | 8 drivers/staging/sm750fb/sm750.c | 70 ++-- drivers/staging/sm750fb/sm750.h | 11 ++--- drivers/staging/sm750fb/sm750_accel.c| 4 +- drivers/staging/sm750fb/sm750_accel.h| 4 +- drivers/staging/sm750fb/sm750_cursor.c | 5 +-- 7 files changed, 14 insertions(+), 99 deletions(-) -- 1.8.1.2 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 4/6] staging: sm750fb: correct incompatible pointer type
we were getting build warnings about assignment of incompatible
pointer types. some of the function definitions were having wrong
return type or arguments.
Signed-off-by: Sudip Mukherjee su...@vectorindia.org
---
drivers/staging/sm750fb/sm750.h | 11 ++-
drivers/staging/sm750fb/sm750_accel.c | 4 ++--
drivers/staging/sm750fb/sm750_accel.h | 4 ++--
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index d39968c..edb955a 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -23,7 +23,7 @@ struct lynx_accel{
volatile unsigned char __iomem * dpPortBase;
/* function fointers */
- int (*de_init)(struct lynx_accel *);
+ void (*de_init)(struct lynx_accel *);
int (*de_wait)(void);/* see if hardware ready to work */
@@ -34,8 +34,8 @@ struct lynx_accel{
u32,u32,u32,u32,
u32,u32,u32,u32);
- int (*de_imageblit)(struct lynx_accel *,const char *,u32,u32,u32,
-
u32,u32,u32,u32,u32,u32,u32,u32,u32);
+ int (*de_imageblit)(struct lynx_accel *, const char *, u32, u32, u32,
+ u32, u32, u32, u32, u32, u32, u32, u32, u32);
};
@@ -120,8 +120,9 @@ struct lynxfb_crtc{
int(*proc_setColReg)(struct lynxfb_crtc*,ushort,ushort,ushort,ushort);
void (*clear)(struct lynxfb_crtc*);
/* pan display */
-int(*proc_panDisplay)(struct lynxfb_crtc*, struct fb_var_screeninfo*,
-struct fb_info*);
+ int (*proc_panDisplay)(struct lynxfb_crtc*,
+ const struct fb_var_screeninfo*,
+ const struct fb_info*);
/* cursor information */
struct lynx_cursor cursor;
};
diff --git a/drivers/staging/sm750fb/sm750_accel.c
b/drivers/staging/sm750fb/sm750_accel.c
index ee211de..421adef 100644
--- a/drivers/staging/sm750fb/sm750_accel.c
+++ b/drivers/staging/sm750fb/sm750_accel.c
@@ -397,8 +397,8 @@ static unsigned int deGetTransparency(struct lynx_accel *
accel)
int hw_imageblit(
struct lynx_accel * accel,
-unsigned char *pSrcbuf, /* pointer to start of source buffer in system memory
*/
-int srcDelta, /* Pitch value (in bytes) of the source buffer, +ive
means top down and -ive mean button up */
+const char *pSrcbuf, /* pointer to start of source buffer in system memory */
+unsigned int srcDelta, /* Pitch value (in bytes) of the source
buffer, +ive means top down and -ive mean button up */
unsigned int startBit, /* Mono data can start at any bit in a byte, this value
should be 0 to 7 */
unsigned int dBase,/* Address of destination: offset in frame buffer */
unsigned int dPitch, /* Pitch value of destination surface in BYTE */
diff --git a/drivers/staging/sm750fb/sm750_accel.h
b/drivers/staging/sm750fb/sm750_accel.h
index 575f4a7..9c16618 100644
--- a/drivers/staging/sm750fb/sm750_accel.h
+++ b/drivers/staging/sm750fb/sm750_accel.h
@@ -260,8 +260,8 @@ unsigned int rop2);
int hw_imageblit(
struct lynx_accel * accel,
-unsigned char *pSrcbuf, /* pointer to start of source buffer in system memory
*/
-int srcDelta, /* Pitch value (in bytes) of the source buffer, +ive
means top down and -ive mean button up */
+const char *pSrcbuf, /* pointer to start of source buffer in system memory */
+unsigned int srcDelta, /* Pitch value (in bytes) of the source buffer, +ive
means top down and -ive mean button up */
unsigned int startBit, /* Mono data can start at any bit in a byte, this value
should be 0 to 7 */
unsigned int dBase,/* Address of destination: offset in frame buffer */
unsigned int dPitch, /* Pitch value of destination surface in BYTE */
--
1.8.1.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 5/6] staging: sm750fb: fix mixed declarations
we were getting build warning about mixed declaration. the variable
is now declared at the beginning of the block.
Signed-off-by: Sudip Mukherjee su...@vectorindia.org
---
drivers/staging/sm750fb/sm750.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
index 87029b6..021b863 100644
--- a/drivers/staging/sm750fb/sm750.c
+++ b/drivers/staging/sm750fb/sm750.c
@@ -1175,6 +1175,7 @@ ALLOC_FB:
else
{
struct lynxfb_par * par;
+ int errno;
pr_info(framebuffer #%d alloc okay\n,fbidx);
share-fbinfo[fbidx] = info[fbidx];
par = info[fbidx]-par;
@@ -1191,7 +1192,7 @@ ALLOC_FB:
/* register frame buffer*/
pr_info(Ready to register framebuffer #%d.\n,fbidx);
- int errno = register_framebuffer(info[fbidx]);
+ errno = register_framebuffer(info[fbidx]);
if (errno 0) {
pr_err(Failed to register fb_info #%d. err
%d\n,fbidx, errno);
if(fbidx == 0)
--
1.8.1.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 0/6] Drivers: hv: Miscellaneous fixes
On Tue, Mar 10, 2015 at 02:54:16PM +, KY Srinivasan wrote: -Original Message- From: gre...@linuxfoundation.org [mailto:gre...@linuxfoundation.org] Sent: Tuesday, March 10, 2015 12:41 AM To: KY Srinivasan Cc: linux-ker...@vger.kernel.org; de...@linuxdriverproject.org; o...@aepfle.de; a...@canonical.com; vkuzn...@redhat.com Subject: Re: [PATCH 0/6] Drivers: hv: Miscellaneous fixes On Tue, Mar 10, 2015 at 03:31:44AM +, KY Srinivasan wrote: -Original Message- From: KY Srinivasan Sent: Friday, March 6, 2015 9:20 PM To: KY Srinivasan; gre...@linuxfoundation.org; linux- ker...@vger.kernel.org; de...@linuxdriverproject.org; o...@aepfle.de; a...@canonical.com; vkuzn...@redhat.com Subject: RE: [PATCH 0/6] Drivers: hv: Miscellaneous fixes -Original Message- From: K. Y. Srinivasan [mailto:k...@microsoft.com] Sent: Friday, March 6, 2015 9:10 PM To: gre...@linuxfoundation.org; linux-ker...@vger.kernel.org; de...@linuxdriverproject.org; o...@aepfle.de; a...@canonical.com; vkuzn...@redhat.com Cc: KY Srinivasan Subject: [PATCH 0/6] Drivers: hv: Miscellaneous fixes This patch-set has miscellaneous fixes for both the VMBUS as well as the balloon driver. Dan Carpenter (1): hv: vmbus: missing curly braces in vmbus_process_offer() K. Y. Srinivasan (2): Drivers: hv: vmbus: Export the vmbus_sendpacket_pagebuffer_ctl() Drivers: hv: vmbus: Perform device register in the per-channel work element Greg, the upstream kernel is currently broken on Hyper-V under some configurations and this patch fixes the issue. Please apply. Please apply what? You said a while ago, in this email thread: Please drop the patch-set; one of the patches I sent was incorrect. I will resend. so this series is long-gone from my patch queue. I have others from my waiting to be reviewed, perhaps you meant those instead? Greg, Yes, sorry for the confusion; I meant the second set of 7 patches that has the V2 tag. The one where I rejected the first patch? :) That didn't seem relevant for 4.0-final, if it was, please redo it such that the bug fixes are obvious. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 0/4] staging/lustre: checkpatch cleanup
This patchset attempts to fix the following issues catched by checkpatch: trailing semicolons in macros use of __attribute__(format(printf,...)) where __printf(...) would suffice use of __attribute__(aligned(size)) where __aligned(size) would suffice use of __attribute__(packed) where __packed would suffice Mario J. Rugiero (4): staging/lustre: checkpatch cleanup: macros should not use a trailing semicolon staging/lustre: checkpatch cleanup: __printf(string-index, first-to-check) is preferred over __attribute__((format(printf, string-index, first-to-check))) staging/lustre: checkpatch cleanup: __aligned(size) is preferred over __attribute__((aligned(size))) staging/lustre: checkpatch cleanup: __packed is preferred over __attribute__((packed)) .../lustre/include/linux/libcfs/libcfs_debug.h | 6 +-- .../include/linux/libcfs/libcfs_kernelcomm.h | 4 +- .../lustre/include/linux/libcfs/libcfs_private.h | 4 +- .../staging/lustre/include/linux/lnet/lib-types.h | 2 +- .../staging/lustre/lustre/include/lprocfs_status.h | 6 +-- drivers/staging/lustre/lustre/include/lu_object.h | 2 +- .../lustre/lustre/include/lustre/lustre_idl.h | 44 +++--- .../lustre/lustre/include/lustre/lustre_user.h | 14 +++ drivers/staging/lustre/lustre/include/lustre_dlm.h | 2 +- drivers/staging/lustre/lustre/include/lustre_net.h | 2 +- 10 files changed, 43 insertions(+), 43 deletions(-) -- 2.3.2 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2] staging: sm750fb: Fix sparse warning
On 10 March 2015 at 15:06, Greg KH gre...@linuxfoundation.org wrote: This doesn't apply anymore due to other patches I just took, so can you rebase this patch on my latest staging-testing branch of staging.git? Fixed in v3 of staging: sm750fb: Cleanup the type of mmio75. Also, how about someone fixing the real compiler warnings this driver is spitting out first, before we worry about sparse warnings? That's much more relevant here as it's keeping the driver from being built in linux-next at the moment. thanks, greg k-h I am more than happy to take a look at this later today when I have the opportunity to do so :) -- Lorenzo Stoakes https:/ljs.io ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 13/56] staging: comedi: addi_apci_3xxx: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/addi_apci_3xxx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c index c173810..8dadab8 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c +++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c @@ -23,10 +23,9 @@ */ #include linux/module.h -#include linux/pci.h #include linux/interrupt.h -#include ../comedidev.h +#include ../comedi_pci.h #include comedi_fc.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 17/56] staging: comedi: adl_pci9111: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/adl_pci9111.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c index bf563ed..5ca7c6e 100644 --- a/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/drivers/staging/comedi/drivers/adl_pci9111.c @@ -65,11 +65,10 @@ TODO: */ #include linux/module.h -#include linux/pci.h #include linux/delay.h #include linux/interrupt.h -#include ../comedidev.h +#include ../comedi_pci.h #include plx9052.h #include comedi_fc.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 35/56] staging: comedi: das08_pci: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/das08_pci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/das08_pci.c b/drivers/staging/comedi/drivers/das08_pci.c index b2ea10b..d8d27fa 100644 --- a/drivers/staging/comedi/drivers/das08_pci.c +++ b/drivers/staging/comedi/drivers/das08_pci.c @@ -32,9 +32,8 @@ */ #include linux/module.h -#include linux/pci.h -#include ../comedidev.h +#include ../comedi_pci.h #include das08.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 12/56] staging: comedi: addi_apci_3501: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/addi_apci_3501.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c index b8f3366..08c9c58 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3501.c +++ b/drivers/staging/comedi/drivers/addi_apci_3501.c @@ -23,11 +23,10 @@ */ #include linux/module.h -#include linux/pci.h #include linux/interrupt.h #include linux/sched.h -#include ../comedidev.h +#include ../comedi_pci.h #include comedi_fc.h #include amcc_s5933.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 29/56] staging: comedi: cb_pcidas: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/cb_pcidas.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c index 6fdf975..bad04d9 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas.c +++ b/drivers/staging/comedi/drivers/cb_pcidas.c @@ -62,11 +62,10 @@ analog triggering on 1602 series */ #include linux/module.h -#include linux/pci.h #include linux/delay.h #include linux/interrupt.h -#include ../comedidev.h +#include ../comedi_pci.h #include comedi_8254.h #include 8255.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 07/56] staging: comedi: addi_apci_1564: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/addi_apci_1564.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c index 2de5e83..c481c48 100644 --- a/drivers/staging/comedi/drivers/addi_apci_1564.c +++ b/drivers/staging/comedi/drivers/addi_apci_1564.c @@ -22,11 +22,10 @@ */ #include linux/module.h -#include linux/pci.h #include linux/interrupt.h #include linux/sched.h -#include ../comedidev.h +#include ../comedi_pci.h #include comedi_fc.h #include addi_tcw.h #include addi_watchdog.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 10/56] staging: comedi: addi_apci_2200: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/addi_apci_2200.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi_apci_2200.c b/drivers/staging/comedi/drivers/addi_apci_2200.c index 1f9d136..2b382a5 100644 --- a/drivers/staging/comedi/drivers/addi_apci_2200.c +++ b/drivers/staging/comedi/drivers/addi_apci_2200.c @@ -23,9 +23,8 @@ */ #include linux/module.h -#include linux/pci.h -#include ../comedidev.h +#include ../comedi_pci.h #include addi_watchdog.h /* -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 24/56] staging: comedi: amplc_pci224: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/amplc_pci224.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c index cf5f646..6c9fa4a 100644 --- a/drivers/staging/comedi/drivers/amplc_pci224.c +++ b/drivers/staging/comedi/drivers/amplc_pci224.c @@ -103,11 +103,10 @@ */ #include linux/module.h -#include linux/pci.h #include linux/interrupt.h #include linux/slab.h -#include ../comedidev.h +#include ../comedi_pci.h #include comedi_fc.h #include comedi_8254.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 03/56] staging: comedi: 8255_pci: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/8255_pci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/8255_pci.c b/drivers/staging/comedi/drivers/8255_pci.c index 291aed1..bb9854b 100644 --- a/drivers/staging/comedi/drivers/8255_pci.c +++ b/drivers/staging/comedi/drivers/8255_pci.c @@ -62,9 +62,8 @@ */ #include linux/module.h -#include linux/pci.h -#include ../comedidev.h +#include ../comedi_pci.h #include 8255.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 18/56] staging: comedi: adl_pci9118: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/adl_pci9118.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c index 65b702c..eb4a528 100644 --- a/drivers/staging/comedi/drivers/adl_pci9118.c +++ b/drivers/staging/comedi/drivers/adl_pci9118.c @@ -73,13 +73,12 @@ */ #include linux/module.h -#include linux/pci.h #include linux/delay.h #include linux/gfp.h #include linux/interrupt.h #include linux/io.h -#include ../comedidev.h +#include ../comedi_pci.h #include amcc_s5933.h #include comedi_8254.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 34/56] staging: comedi: daqboard2000: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/daqboard2000.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c index d625afd..f97d18d 100644 --- a/drivers/staging/comedi/drivers/daqboard2000.c +++ b/drivers/staging/comedi/drivers/daqboard2000.c @@ -103,11 +103,10 @@ Configuration options: not applicable, uses PCI auto config */ #include linux/module.h -#include linux/pci.h #include linux/delay.h #include linux/interrupt.h -#include ../comedidev.h +#include ../comedi_pci.h #include 8255.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 05/56] staging: comedi: addi_apci_1500: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/addi_apci_1500.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c index 3dd0179..c71847e 100644 --- a/drivers/staging/comedi/drivers/addi_apci_1500.c +++ b/drivers/staging/comedi/drivers/addi_apci_1500.c @@ -22,10 +22,9 @@ */ #include linux/module.h -#include linux/pci.h #include linux/interrupt.h -#include ../comedidev.h +#include ../comedi_pci.h #include comedi_fc.h #include amcc_s5933.h #include z8536.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 21/56] staging: comedi: adv_pci1724: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/adv_pci1724.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/adv_pci1724.c b/drivers/staging/comedi/drivers/adv_pci1724.c index a3573ea..f7a7dab 100644 --- a/drivers/staging/comedi/drivers/adv_pci1724.c +++ b/drivers/staging/comedi/drivers/adv_pci1724.c @@ -47,9 +47,8 @@ */ #include linux/module.h -#include linux/pci.h -#include ../comedidev.h +#include ../comedi_pci.h /* * PCI bar 2 Register I/O map (dev-iobase) -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 20/56] staging: comedi: adv_pci1723: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/adv_pci1723.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c index f1945be..1921a97 100644 --- a/drivers/staging/comedi/drivers/adv_pci1723.c +++ b/drivers/staging/comedi/drivers/adv_pci1723.c @@ -41,9 +41,8 @@ */ #include linux/module.h -#include linux/pci.h -#include ../comedidev.h +#include ../comedi_pci.h /* * PCI Bar 2 I/O Register map (dev-iobase) -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 42/56] staging: comedi: me4000: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/me4000.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c index ec99254..2502ac6 100644 --- a/drivers/staging/comedi/drivers/me4000.c +++ b/drivers/staging/comedi/drivers/me4000.c @@ -41,11 +41,10 @@ broken. */ #include linux/module.h -#include linux/pci.h #include linux/delay.h #include linux/interrupt.h -#include ../comedidev.h +#include ../comedi_pci.h #include comedi_fc.h #include comedi_8254.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 54/56] staging: comedi: rtd520: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/rtd520.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c index f05b187..d1ecb51 100644 --- a/drivers/staging/comedi/drivers/rtd520.c +++ b/drivers/staging/comedi/drivers/rtd520.c @@ -94,11 +94,10 @@ */ #include linux/module.h -#include linux/pci.h #include linux/delay.h #include linux/interrupt.h -#include ../comedidev.h +#include ../comedi_pci.h #include comedi_fc.h #include plx9080.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 50/56] staging: comedi: ni_670x: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/ni_670x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c index 90b4dfa..13c6ccb 100644 --- a/drivers/staging/comedi/drivers/ni_670x.c +++ b/drivers/staging/comedi/drivers/ni_670x.c @@ -37,11 +37,10 @@ Commands are not supported. */ #include linux/module.h -#include linux/pci.h #include linux/interrupt.h #include linux/slab.h -#include ../comedidev.h +#include ../comedi_pci.h #define AO_VALUE_OFFSET0x00 #defineAO_CHAN_OFFSET 0x0c -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 52/56] staging: comedi: ni_pcmdio: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/ni_pcidio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c index 2852319..9e01f8d 100644 --- a/drivers/staging/comedi/drivers/ni_pcidio.c +++ b/drivers/staging/comedi/drivers/ni_pcidio.c @@ -53,7 +53,7 @@ comedi_nonfree_firmware tarball available from http://www.comedi.org #include linux/interrupt.h #include linux/sched.h -#include ../comedidev.h +#include ../comedi_pci.h #include comedi_fc.h #include mite.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 2/2 net-next] hyperv: Support batched notification
On Wed, Mar 11, 2015 at 2:50 AM, K. Y. Srinivasan k...@microsoft.com
wrote:
Optimize notifying the host by deferring notification until there
are no more packets to be sent. This will help in batching the
requests
on the host.
Signed-off-by: K. Y. Srinivasan k...@microsoft.com
---
drivers/net/hyperv/hyperv_net.h |2 +-
drivers/net/hyperv/netvsc.c | 14 +-
drivers/net/hyperv/netvsc_drv.c |3 ++-
drivers/net/hyperv/rndis_filter.c |2 +-
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/net/hyperv/hyperv_net.h
b/drivers/net/hyperv/hyperv_net.h
index 4815843..3fd9896 100644
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -184,7 +184,7 @@ struct rndis_device {
int netvsc_device_add(struct hv_device *device, void
*additional_info);
int netvsc_device_remove(struct hv_device *device);
int netvsc_send(struct hv_device *device,
- struct hv_netvsc_packet *packet);
+ struct hv_netvsc_packet *packet, bool kick_q);
void netvsc_linkstatus_callback(struct hv_device *device_obj,
struct rndis_message *resp);
int netvsc_recv_callback(struct hv_device *device_obj,
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index 208eb05..9003b94 100644
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -707,7 +707,7 @@ static u32 netvsc_copy_to_send_buf(struct
netvsc_device *net_device,
}
int netvsc_send(struct hv_device *device,
- struct hv_netvsc_packet *packet)
+ struct hv_netvsc_packet *packet, bool kick_q)
{
struct netvsc_device *net_device;
int ret = 0;
@@ -719,6 +719,7 @@ int netvsc_send(struct hv_device *device,
u32 msg_size = 0;
struct sk_buff *skb = NULL;
u16 q_idx = packet-q_idx;
+ u32 vmbus_flags = VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED;
net_device = get_outbound_net_device(device);
@@ -768,18 +769,21 @@ int netvsc_send(struct hv_device *device,
return -ENODEV;
if (packet-page_buf_cnt) {
- ret = vmbus_sendpacket_pagebuffer(out_channel,
+ ret = vmbus_sendpacket_pagebuffer_ctl(out_channel,
packet-page_buf,
packet-page_buf_cnt,
sendMessage,
sizeof(struct nvsp_message),
- req_id);
+ req_id,
+ vmbus_flags,
+ kick_q);
What if kick_q is false but ret is -EAGAIN here? Looks like in this
case host won't get notified at all. How about checking whether txq and
kicking if it has been stopped like what other network driver did?
} else {
- ret = vmbus_sendpacket(out_channel, sendMessage,
+ ret = vmbus_sendpacket_ctl(out_channel, sendMessage,
sizeof(struct nvsp_message),
req_id,
VM_PKT_DATA_INBAND,
- VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
+ vmbus_flags,
+ kick_q);
}
if (ret == 0) {
diff --git a/drivers/net/hyperv/netvsc_drv.c
b/drivers/net/hyperv/netvsc_drv.c
index a06bd66..80b4b29 100644
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -384,6 +384,7 @@ static int netvsc_start_xmit(struct sk_buff *skb,
struct net_device *net)
u32 net_trans_info;
u32 hash;
u32 skb_length = skb-len;
+ bool kick_q = !skb-xmit_more;
/* We will atmost need two pages to describe the rndis
@@ -556,7 +557,7 @@ do_send:
packet-page_buf_cnt = init_page_array(rndis_msg, rndis_msg_size,
skb, packet-page_buf[0]);
- ret = netvsc_send(net_device_ctx-device_ctx, packet);
+ ret = netvsc_send(net_device_ctx-device_ctx, packet, kick_q);
drop:
if (ret == 0) {
diff --git a/drivers/net/hyperv/rndis_filter.c
b/drivers/net/hyperv/rndis_filter.c
index ca81de0..05f3792 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -238,7 +238,7 @@ static int rndis_filter_send_request(struct
rndis_device *dev,
packet-send_completion = NULL;
- ret = netvsc_send(dev-net_dev-dev, packet);
+ ret = netvsc_send(dev-net_dev-dev, packet, true);
return ret;
}
--
1.7.4.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH RESEND] staging:fbtft:Fix build warnings for incorrently using %d for size_t variables in dev_err statements
Fixes the build warnings for using %d for a variable of type size_t in dev_err
statements
for the functions,fbtft_read_spi and fbtft_write_spi_emulate_9 respectfully by
changing
both dev_error calls to use the correct format specifier,zu for size_t instead.
Signed-off-by: Nicholas Krause xerofo...@gmail.com
---
drivers/staging/fbtft/fbtft-io.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/fbtft/fbtft-io.c b/drivers/staging/fbtft/fbtft-io.c
index 32155a7..9b2f8cf 100644
--- a/drivers/staging/fbtft/fbtft-io.c
+++ b/drivers/staging/fbtft/fbtft-io.c
@@ -59,7 +59,7 @@ int fbtft_write_spi_emulate_9(struct fbtft_par *par, void
*buf, size_t len)
}
if ((len % 8) != 0) {
dev_err(par-info-device,
- %s: error: len=%d must be divisible by 8\n,
+ %s: error: len=%zu must be divisible by 8\n,
__func__, len);
return -EINVAL;
}
@@ -106,7 +106,7 @@ int fbtft_read_spi(struct fbtft_par *par, void *buf, size_t
len)
if (par-startbyte) {
if (len 32) {
dev_err(par-info-device,
- %s: len=%d can't be larger than 32 when using
'startbyte'\n,
+ %s: len=%zu can't be larger than 32 when using
'startbyte'\n,
__func__, len);
return -EINVAL;
}
--
2.1.0
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/4] staging/lustre: use __printf(...) instead of __attribute__(format(__printf, ...))
Replace uses of __attribute__(format(__printf,...)) by __printf(...), as
suggested by checkpatch.
Signed-off-by: Mario J. Rugiero mrugi...@gmail.com
---
drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h | 4 ++--
drivers/staging/lustre/lustre/include/lu_object.h | 2 +-
drivers/staging/lustre/lustre/include/lustre_dlm.h | 2 +-
drivers/staging/lustre/lustre/include/lustre_net.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
index 840dd1b..8251ac9 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
@@ -244,12 +244,12 @@ do {
\
int libcfs_debug_msg(struct libcfs_debug_msg_data *msgdata,
const char *format1, ...)
- __attribute__ ((format (printf, 2, 3)));
+ __printf(2, 3);
int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,
const char *format1,
va_list args, const char *format2, ...)
- __attribute__ ((format (printf, 4, 5)));
+ __printf(4, 5);
/* other external symbols that tracefile provides: */
int cfs_trace_copyin_string(char *knl_buffer, int knl_buffer_nob,
diff --git a/drivers/staging/lustre/lustre/include/lu_object.h
b/drivers/staging/lustre/lustre/include/lu_object.h
index fc3f234..7f8871e 100644
--- a/drivers/staging/lustre/lustre/include/lu_object.h
+++ b/drivers/staging/lustre/lustre/include/lu_object.h
@@ -192,7 +192,7 @@ struct lu_object_conf {
*/
typedef int (*lu_printer_t)(const struct lu_env *env,
void *cookie, const char *format, ...)
- __attribute__ ((format (printf, 3, 4)));
+ __printf(3, 4);
/**
* Operations specific for particular lu_object.
diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h
b/drivers/staging/lustre/lustre/include/lustre_dlm.h
index 6be6079..b682a60 100644
--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
@@ -1075,7 +1075,7 @@ extern char *ldlm_it2str(int it);
void _ldlm_lock_debug(struct ldlm_lock *lock,
struct libcfs_debug_msg_data *data,
const char *fmt, ...)
- __attribute__ ((format (printf, 3, 4)));
+ __printf(3, 4);
/**
* Rate-limited version of lock printing function.
diff --git a/drivers/staging/lustre/lustre/include/lustre_net.h
b/drivers/staging/lustre/lustre/include/lustre_net.h
index 36396d1..e2805bd 100644
--- a/drivers/staging/lustre/lustre/include/lustre_net.h
+++ b/drivers/staging/lustre/lustre/include/lustre_net.h
@@ -1673,7 +1673,7 @@ ptlrpc_rqphase2str(struct ptlrpc_request *req)
void _debug_req(struct ptlrpc_request *req,
struct libcfs_debug_msg_data *data, const char *fmt, ...)
- __attribute__ ((format (printf, 3, 4)));
+ __printf(3, 4);
/**
* Helper that decides if we need to print request according to current debug
--
2.3.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 1/4] staging/lustre: clean trailing semicolons in macros
Remove trailing semicolons from macros, as suggested by checkpatch.
Signed-off-by: Mario J. Rugiero mrugi...@gmail.com
---
drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h | 2 +-
drivers/staging/lustre/include/linux/libcfs/libcfs_private.h | 4 ++--
drivers/staging/lustre/lustre/include/lprocfs_status.h | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
index 2e5a9e5..840dd1b 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
@@ -196,7 +196,7 @@ do {
\
.msg_fn = __func__, \
.msg_line = __LINE__, \
.msg_cdls = (cdls) }; \
- dataname.msg_mask = (mask);
+ dataname.msg_mask = (mask)
/**
* Filters out logging messages based on mask and subsystem.
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
index ac9238a..515a54e 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
@@ -317,8 +317,8 @@ do {
\
#define LASSERT_ATOMIC_ZERO(a) LASSERT_ATOMIC_EQ(a, 0)
#define LASSERT_ATOMIC_POS(a) LASSERT_ATOMIC_GT(a, 0)
-#define CFS_ALLOC_PTR(ptr) LIBCFS_ALLOC(ptr, sizeof(*(ptr)));
-#define CFS_FREE_PTR(ptr) LIBCFS_FREE(ptr, sizeof(*(ptr)));
+#define CFS_ALLOC_PTR(ptr) LIBCFS_ALLOC(ptr, sizeof(*(ptr)))
+#define CFS_FREE_PTR(ptr) LIBCFS_FREE(ptr, sizeof(*(ptr)))
/*
* percpu partition lock
diff --git a/drivers/staging/lustre/lustre/include/lprocfs_status.h
b/drivers/staging/lustre/lustre/include/lprocfs_status.h
index 8a25cf6..d030847 100644
--- a/drivers/staging/lustre/lustre/include/lprocfs_status.h
+++ b/drivers/staging/lustre/lustre/include/lprocfs_status.h
@@ -679,7 +679,7 @@ extern int lprocfs_seq_release(struct inode *, struct file
*);
} \
} while (0)
#define LPROCFS_CLIMP_EXIT(obd) \
- up_read((obd)-u.cli.cl_sem);
+ up_read((obd)-u.cli.cl_sem)
/* write the name##_seq_show function, call LPROC_SEQ_FOPS_RO for read-only
@@ -723,7 +723,7 @@ static struct file_operations name##_fops = {
\
return lprocfs_wr_##type(file, buffer, \
count, seq-private); \
} \
- LPROC_SEQ_FOPS(name##_##type);
+ LPROC_SEQ_FOPS(name##_##type)
#define LPROC_SEQ_FOPS_WR_ONLY(name, type) \
static ssize_t name##_##type##_write(struct file *file, \
@@ -740,7 +740,7 @@ static struct file_operations name##_fops = {
\
.open = name##_##type##_open, \
.write = name##_##type##_write,\
.release = lprocfs_single_release, \
- };
+ }
/* lproc_ptlrpc.c */
struct ptlrpc_request;
--
2.3.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 3/4] staging/lustre: use __aligned(size) instead of __attribute__(aligned(size))
Replace uses of __attribute__(aligned(size)) by __aligned(size), as suggested
by checkpatch.
Signed-off-by: Mario J. Rugiero mrugi...@gmail.com
---
drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
b/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
index f19a121..4688770 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
@@ -58,7 +58,7 @@ struct kuc_hdr {
__u8 kuc_flags;
__u16 kuc_msgtype;/* Message type or opcode, transport-specific */
__u16 kuc_msglen; /* Including header */
-} __attribute__((aligned(sizeof(__u64;
+} __aligned(sizeof(__u64));
#define KUC_CHANGELOG_MSG_MAXSIZE (sizeof(struct kuc_hdr)+CR_MAXSIZE)
--
2.3.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: sm750fb: Cleanup the type of mmio750
On 10 March 2015 at 15:04, Greg KH gre...@linuxfoundation.org wrote: I can't apply patches that add new build warnings, sorry. Please fix this up in the patch itself. greg k-h Hi Greg, Apologies for this, I've resolved this issue in v2 of the patch, no warning messages are added in the updated version of this patch. Best, -- Lorenzo Stoakes https:/ljs.io ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 36/56] staging: comedi: dt3000: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/dt3000.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c index 0aa5198..1b8ac99 100644 --- a/drivers/staging/comedi/drivers/dt3000.c +++ b/drivers/staging/comedi/drivers/dt3000.c @@ -49,11 +49,10 @@ AO commands are not supported. */ #include linux/module.h -#include linux/pci.h #include linux/delay.h #include linux/interrupt.h -#include ../comedidev.h +#include ../comedi_pci.h #include comedi_fc.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 51/56] staging: comedi: ni_labpc_pci: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/ni_labpc_pci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/ni_labpc_pci.c b/drivers/staging/comedi/drivers/ni_labpc_pci.c index f50a5a2..77d4038 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_pci.c +++ b/drivers/staging/comedi/drivers/ni_labpc_pci.c @@ -31,9 +31,8 @@ #include linux/module.h #include linux/interrupt.h -#include linux/pci.h -#include ../comedidev.h +#include ../comedi_pci.h #include ni_labpc.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 53/56] staging: comedi: ni_pcmmio: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/ni_pcimio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c index 409090d..1481f71a 100644 --- a/drivers/staging/comedi/drivers/ni_pcimio.c +++ b/drivers/staging/comedi/drivers/ni_pcimio.c @@ -109,7 +109,7 @@ Bugs: #include linux/module.h #include linux/delay.h -#include ../comedidev.h +#include ../comedi_pci.h #include asm/byteorder.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 49/56] staging: comedi: ni_660x: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/ni_660x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c index 660dc6f..b913158 100644 --- a/drivers/staging/comedi/drivers/ni_660x.c +++ b/drivers/staging/comedi/drivers/ni_660x.c @@ -35,10 +35,9 @@ */ #include linux/module.h -#include linux/pci.h #include linux/interrupt.h -#include ../comedidev.h +#include ../comedi_pci.h #include comedi_fc.h #include mite.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 47/56] staging: comedi: ni_6527: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/ni_6527.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c index 530f716..dc87114 100644 --- a/drivers/staging/comedi/drivers/ni_6527.c +++ b/drivers/staging/comedi/drivers/ni_6527.c @@ -28,10 +28,9 @@ */ #include linux/module.h -#include linux/pci.h #include linux/interrupt.h -#include ../comedidev.h +#include ../comedi_pci.h #include comedi_fc.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 43/56] staging: comedi: me_daq: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/me_daq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c index 92e2352..d78e919 100644 --- a/drivers/staging/comedi/drivers/me_daq.c +++ b/drivers/staging/comedi/drivers/me_daq.c @@ -30,11 +30,10 @@ */ #include linux/module.h -#include linux/pci.h #include linux/interrupt.h #include linux/sched.h -#include ../comedidev.h +#include ../comedi_pci.h #include plx9052.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] SCSI:STORVSC Use SCSI layer to allocate memory for per-command device request data
On Tue, Mar 10, Christoph Hellwig wrote: On Tue, Mar 10, 2015 at 12:42:33PM +0100, Olaf Hering wrote: It would be nice to change .proc_name to KBUILD_MODNAME before v4.0 is released. We carry a patch which adds this field. Of cource we can just change the patch, but if code gets touched upstream anyway... Please send a patch. Would be nice if you had sent it long go insted of just including it in a vendor tree.. I was told .procname was dead, but since the patch adds it anyway it should have a content thats in use (by us). Olaf ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH V2 1/7] Drivers: hv: vmbus: Export the vmbus_sendpacket_pagebuffer_ctl()
On Tue, Mar 10, 2015 at 03:05:26PM +, KY Srinivasan wrote: -Original Message- From: Greg KH [mailto:gre...@linuxfoundation.org] Sent: Tuesday, March 10, 2015 12:42 AM To: KY Srinivasan Cc: linux-ker...@vger.kernel.org; de...@linuxdriverproject.org; o...@aepfle.de; a...@canonical.com; vkuzn...@redhat.com Subject: Re: [PATCH V2 1/7] Drivers: hv: vmbus: Export the vmbus_sendpacket_pagebuffer_ctl() On Fri, Mar 06, 2015 at 11:04:28PM -0800, K. Y. Srinivasan wrote: Export the vmbus_sendpacket_pagebuffer_ctl() interface. Why? Nothing in this patch needs it. Please include this in the patch that needs the symbol, or at least give a hint as to what is going on. As it is, this just looks like a random export for no reason at all :( This will be used by Hyper-V networking driver to optimize signaling on the send path. I wanted these patches committed before I sent the networking patch to David Miller. I implemented the two vmbus APIs for sending messages: 1) vmbus_sendpacket_ctl() 2) vmbus_sendpacket_pagebuffer_ctl() and I forgot to export the second form of the send API in an earlier patch-set that you have already committed. I need both to be exported to for the netvsc patch I have. Then just send it as part of the netvsc patches please. On a different note, upstream Linux is currently broken on Hyper-V and a patch in this set Fixes it: 0002-Drivers-hv-vmbus-Perform-device-register-in-the-per-.patch That should have been pointed out somewhere :) Do you want me to resend this set? Yes, please do. Break it up into two different sets, one for 4.0-final, and one for 4.1-rc1. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 19/56] staging: comedi: adv_pci1710: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/adv_pci1710.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c index 4a0fb62..f71750b 100644 --- a/drivers/staging/comedi/drivers/adv_pci1710.c +++ b/drivers/staging/comedi/drivers/adv_pci1710.c @@ -42,10 +42,9 @@ Configuration options: */ #include linux/module.h -#include linux/pci.h #include linux/interrupt.h -#include ../comedidev.h +#include ../comedi_pci.h #include comedi_fc.h #include comedi_8254.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 40/56] staging: comedi: jr3_pci: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/jr3_pci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c index 81fab2d..a802d99 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.c +++ b/drivers/staging/comedi/drivers/jr3_pci.c @@ -39,14 +39,13 @@ #include linux/kernel.h #include linux/module.h -#include linux/pci.h #include linux/delay.h #include linux/ctype.h #include linux/jiffies.h #include linux/slab.h #include linux/timer.h -#include ../comedidev.h +#include ../comedi_pci.h #include jr3_pci.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 41/56] staging: comedi: ke_counter: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/ke_counter.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c index 3c19e0f..dc642ed 100644 --- a/drivers/staging/comedi/drivers/ke_counter.c +++ b/drivers/staging/comedi/drivers/ke_counter.c @@ -28,9 +28,8 @@ */ #include linux/module.h -#include linux/pci.h -#include ../comedidev.h +#include ../comedi_pci.h /* * PCI BAR 0 Register I/O map -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 45/56] staging: comedi: mite.c: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/mite.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/mite.c b/drivers/staging/comedi/drivers/mite.c index 79b5597..4cfe949 100644 --- a/drivers/staging/comedi/drivers/mite.c +++ b/drivers/staging/comedi/drivers/mite.c @@ -47,9 +47,8 @@ #define pr_fmt(fmt) KBUILD_MODNAME : fmt #include linux/module.h -#include linux/pci.h -#include ../comedidev.h +#include ../comedi_pci.h #include comedi_fc.h #include mite.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 56/56] staging: comedi: comedi_pci.h: move PCI stuff out of comedidev.h
Move the PCI-specific stuff out of comedidev.h into comedi_pci.h. Comedi PCI drivers now include comedi_pci.h instead of comedidev.h, which now gets pulled in indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/comedi_pci.h | 36 ++- drivers/staging/comedi/comedidev.h | 43 - 2 files changed, 35 insertions(+), 44 deletions(-) diff --git a/drivers/staging/comedi/comedi_pci.h b/drivers/staging/comedi/comedi_pci.h index a083465..4005cc9 100644 --- a/drivers/staging/comedi/comedi_pci.h +++ b/drivers/staging/comedi/comedi_pci.h @@ -24,7 +24,41 @@ #include comedidev.h /* - * TODO: Move PCI-specific stuff into here from comedidev.h. + * PCI Vendor IDs not in linux/pci_ids.h */ +#define PCI_VENDOR_ID_KOLTER 0x1001 +#define PCI_VENDOR_ID_ICP 0x104c +#define PCI_VENDOR_ID_DT 0x1116 +#define PCI_VENDOR_ID_IOTECH 0x1616 +#define PCI_VENDOR_ID_CONTEC 0x1221 +#define PCI_VENDOR_ID_RTD 0x1435 +#define PCI_VENDOR_ID_HUMUSOFT 0x186c + +struct pci_dev *comedi_to_pci_dev(struct comedi_device *); + +int comedi_pci_enable(struct comedi_device *); +void comedi_pci_disable(struct comedi_device *); +void comedi_pci_detach(struct comedi_device *); + +int comedi_pci_auto_config(struct pci_dev *, struct comedi_driver *, + unsigned long context); +void comedi_pci_auto_unconfig(struct pci_dev *); + +int comedi_pci_driver_register(struct comedi_driver *, struct pci_driver *); +void comedi_pci_driver_unregister(struct comedi_driver *, struct pci_driver *); + +/** + * module_comedi_pci_driver() - Helper macro for registering a comedi PCI driver + * @__comedi_driver: comedi_driver struct + * @__pci_driver: pci_driver struct + * + * Helper macro for comedi PCI drivers which do not do anything special + * in module init/exit. This eliminates a lot of boilerplate. Each + * module may only use this macro once, and calling it replaces + * module_init() and module_exit() + */ +#define module_comedi_pci_driver(__comedi_driver, __pci_driver) \ + module_driver(__comedi_driver, comedi_pci_driver_register, \ + comedi_pci_driver_unregister, (__pci_driver)) #endif /* _COMEDI_PCI_H */ diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index 30595c0..4720dbc 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h @@ -554,47 +554,4 @@ void comedi_driver_unregister(struct comedi_driver *); module_driver(__comedi_driver, comedi_driver_register, \ comedi_driver_unregister) -/* comedi_pci.c - comedi PCI driver specific functions */ - -/* - * PCI Vendor IDs not in linux/pci_ids.h - */ -#define PCI_VENDOR_ID_KOLTER 0x1001 -#define PCI_VENDOR_ID_ICP 0x104c -#define PCI_VENDOR_ID_DT 0x1116 -#define PCI_VENDOR_ID_IOTECH 0x1616 -#define PCI_VENDOR_ID_CONTEC 0x1221 -#define PCI_VENDOR_ID_RTD 0x1435 -#define PCI_VENDOR_ID_HUMUSOFT 0x186c - -struct pci_dev; -struct pci_driver; - -struct pci_dev *comedi_to_pci_dev(struct comedi_device *); - -int comedi_pci_enable(struct comedi_device *); -void comedi_pci_disable(struct comedi_device *); -void comedi_pci_detach(struct comedi_device *); - -int comedi_pci_auto_config(struct pci_dev *, struct comedi_driver *, - unsigned long context); -void comedi_pci_auto_unconfig(struct pci_dev *); - -int comedi_pci_driver_register(struct comedi_driver *, struct pci_driver *); -void comedi_pci_driver_unregister(struct comedi_driver *, struct pci_driver *); - -/** - * module_comedi_pci_driver() - Helper macro for registering a comedi PCI driver - * @__comedi_driver: comedi_driver struct - * @__pci_driver: pci_driver struct - * - * Helper macro for comedi PCI drivers which do not do anything special - * in module init/exit. This eliminates a lot of boilerplate. Each - * module may only use this macro once, and calling it replaces - * module_init() and module_exit() - */ -#define module_comedi_pci_driver(__comedi_driver, __pci_driver) \ - module_driver(__comedi_driver, comedi_pci_driver_register, \ - comedi_pci_driver_unregister, (__pci_driver)) - #endif /* _COMEDIDEV_H */ -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 55/56] staging: comedi: s626: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/s626.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index 3b9ef9a..53a248b 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c @@ -61,12 +61,11 @@ #include linux/module.h #include linux/delay.h -#include linux/pci.h #include linux/interrupt.h #include linux/kernel.h #include linux/types.h -#include ../comedidev.h +#include ../comedi_pci.h #include comedi_fc.h #include s626.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
RE: [PATCH 0/6] Drivers: hv: Miscellaneous fixes
-Original Message- From: gre...@linuxfoundation.org [mailto:gre...@linuxfoundation.org] Sent: Tuesday, March 10, 2015 12:41 AM To: KY Srinivasan Cc: linux-ker...@vger.kernel.org; de...@linuxdriverproject.org; o...@aepfle.de; a...@canonical.com; vkuzn...@redhat.com Subject: Re: [PATCH 0/6] Drivers: hv: Miscellaneous fixes On Tue, Mar 10, 2015 at 03:31:44AM +, KY Srinivasan wrote: -Original Message- From: KY Srinivasan Sent: Friday, March 6, 2015 9:20 PM To: KY Srinivasan; gre...@linuxfoundation.org; linux- ker...@vger.kernel.org; de...@linuxdriverproject.org; o...@aepfle.de; a...@canonical.com; vkuzn...@redhat.com Subject: RE: [PATCH 0/6] Drivers: hv: Miscellaneous fixes -Original Message- From: K. Y. Srinivasan [mailto:k...@microsoft.com] Sent: Friday, March 6, 2015 9:10 PM To: gre...@linuxfoundation.org; linux-ker...@vger.kernel.org; de...@linuxdriverproject.org; o...@aepfle.de; a...@canonical.com; vkuzn...@redhat.com Cc: KY Srinivasan Subject: [PATCH 0/6] Drivers: hv: Miscellaneous fixes This patch-set has miscellaneous fixes for both the VMBUS as well as the balloon driver. Dan Carpenter (1): hv: vmbus: missing curly braces in vmbus_process_offer() K. Y. Srinivasan (2): Drivers: hv: vmbus: Export the vmbus_sendpacket_pagebuffer_ctl() Drivers: hv: vmbus: Perform device register in the per-channel work element Greg, the upstream kernel is currently broken on Hyper-V under some configurations and this patch fixes the issue. Please apply. Please apply what? You said a while ago, in this email thread: Please drop the patch-set; one of the patches I sent was incorrect. I will resend. so this series is long-gone from my patch queue. I have others from my waiting to be reviewed, perhaps you meant those instead? Greg, Yes, sorry for the confusion; I meant the second set of 7 patches that has the V2 tag. Thank you, K. Y confused, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: sm750fb: Cleanup the type of mmio750
On Tue, Mar 10, 2015 at 12:47:44PM +, Lorenzo Stoakes wrote: On 10 March 2015 at 12:36, Sudip Mukherjee sudipm.mukher...@gmail.com wrote: but it is introducing two new build warnings: drivers/staging/sm750fb/sm750_hw.c: In function ‘hw_sm750_map’: drivers/staging/sm750fb/sm750_hw.c:67:2: warning: passing argument 1 of ‘ddk750_set_mmio’ discards ‘volatile’ qualifier from pointer target type [enabled by default] In file included from drivers/staging/sm750fb/ddk750_mode.h:4:0, from drivers/staging/sm750fb/ddk750.h:15, from drivers/staging/sm750fb/sm750_hw.c:24: and drivers/staging/sm750fb/ddk750_chip.h:77:6: note: expected ‘void *’ but argument is of type ‘volatile unsigned char *’ care to make another patch to solve these two new warnings, and send this patch and the new one in a series and while sending mark the version number in the subject. I think the second warning is simply additional information attached to the 1st to give context? I noticed this issue but felt changing the type of this field would sit outside the purview of this patch as then I'm not only changing the type of mmio750 and code that *directly* interacts with this variable, but also code that indirectly interacts with it, so I felt that should perhaps be a separate patch. I'd love to additionally provide some further patches to help out with issues here too, incidentally! I will try to prepare some further patches tonight in this vein. I can't apply patches that add new build warnings, sorry. Please fix this up in the patch itself. greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 4/4] staging/lustre: use __packed instead of __attribute__(packed)
Replace __attribute__(packed) by __packed as suggested by checkpatch.
Signed-off-by: Mario J. Rugiero mrugi...@gmail.com
---
.../include/linux/libcfs/libcfs_kernelcomm.h | 2 +-
.../staging/lustre/include/linux/lnet/lib-types.h | 2 +-
.../lustre/lustre/include/lustre/lustre_idl.h | 44 +++---
.../lustre/lustre/include/lustre/lustre_user.h | 14 +++
4 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
b/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
index 4688770..a989d26 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h
@@ -107,7 +107,7 @@ typedef struct lustre_kernelcomm {
__u32 lk_group;
__u32 lk_data;
__u32 lk_flags;
-} __attribute__((packed)) lustre_kernelcomm;
+} __packed lustre_kernelcomm;
/* Userspace methods */
int libcfs_ukuc_start(lustre_kernelcomm *l, int groups);
diff --git a/drivers/staging/lustre/include/linux/lnet/lib-types.h
b/drivers/staging/lustre/include/linux/lnet/lib-types.h
index 50537668..feffca2 100644
--- a/drivers/staging/lustre/include/linux/lnet/lib-types.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-types.h
@@ -48,7 +48,7 @@
#include linux/list.h
#include types.h
-#define WIRE_ATTR __attribute__((packed))
+#define WIRE_ATTR __packed
/* Packed version of lnet_process_id_t to transfer via network */
typedef struct {
diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
index 5382bf4..0553043 100644
--- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
+++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
@@ -2954,7 +2954,7 @@ typedef enum {
struct llog_logid {
struct ost_id lgl_oi;
__u32 lgl_ogen;
-} __attribute__((packed));
+} __packed;
/** Records written to the CATALOGS list */
#define CATLIST CATALOGS
@@ -2963,7 +2963,7 @@ struct llog_catid {
__u32 lci_padding1;
__u32 lci_padding2;
__u32 lci_padding3;
-} __attribute__((packed));
+} __packed;
/* Log data record types - there is no specific reason that these need to
* be related to the RPC opcodes, but no reason not to (may be handy later?)
@@ -3027,7 +3027,7 @@ struct llog_logid_rec {
__u64 lid_padding2;
__u64 lid_padding3;
struct llog_rec_taillid_tail;
-} __attribute__((packed));
+} __packed;
struct llog_unlink_rec {
struct llog_rec_hdr lur_hdr;
@@ -3035,7 +3035,7 @@ struct llog_unlink_rec {
__u32 lur_oseq;
__u32 lur_count;
struct llog_rec_taillur_tail;
-} __attribute__((packed));
+} __packed;
struct llog_unlink64_rec {
struct llog_rec_hdr lur_hdr;
@@ -3045,7 +3045,7 @@ struct llog_unlink64_rec {
__u64 lur_padding2;
__u64 lur_padding3;
struct llog_rec_taillur_tail;
-} __attribute__((packed));
+} __packed;
struct llog_setattr64_rec {
struct llog_rec_hdr lsr_hdr;
@@ -3056,7 +3056,7 @@ struct llog_setattr64_rec {
__u32 lsr_gid_h;
__u64 lsr_padding;
struct llog_rec_taillsr_tail;
-} __attribute__((packed));
+} __packed;
struct llog_size_change_rec {
struct llog_rec_hdr lsc_hdr;
@@ -3066,7 +3066,7 @@ struct llog_size_change_rec {
__u64 lsc_padding2;
__u64 lsc_padding3;
struct llog_rec_taillsc_tail;
-} __attribute__((packed));
+} __packed;
#define CHANGELOG_MAGIC 0xca103000
@@ -3083,20 +3083,20 @@ struct llog_size_change_rec {
struct changelog_setinfo {
__u64 cs_recno;
__u32 cs_id;
-} __attribute__((packed));
+} __packed;
/** changelog record */
struct llog_changelog_rec {
struct llog_rec_hdr cr_hdr;
struct changelog_rec cr;
struct llog_rec_tail cr_tail; /** for_sizezof_only */
-} __attribute__((packed));
+} __packed;
struct llog_changelog_ext_rec {
struct llog_rec_hdr cr_hdr;
struct changelog_ext_rec cr;
struct llog_rec_tail cr_tail; /** for_sizezof_only */
-} __attribute__((packed));
+} __packed;
#define CHANGELOG_USER_PREFIX cl
@@ -3106,7 +3106,7 @@ struct llog_changelog_user_rec {
__u32cur_padding;
__u64cur_endrec;
struct llog_rec_tail cur_tail;
-} __attribute__((packed));
+} __packed;
enum agent_req_status {
ARS_WAITING,
@@ -3152,13 +3152,13 @@ struct llog_agent_req_rec {
__u64 arr_req_change; /** req. status change time */
struct hsm_action_item arr_hai;/** req. to the
[PATCH v3] staging: sm750fb: Cleanup the type of mmio750
This patch assigns the more appropriate void* type to the mmio750 variable
eliminating an unnecessary volatile qualifier in the process. Additionally it
updates parameter types as necessary where those parameters interact with
mmio750, removes unnecessary casts and updates the type of the
lynx_share-pvReg field which is passed to the ddk750_set_mmio method.
As a consequence, this patch fixes the following sparse warning:-
drivers/staging/sm750fb/ddk750_help.c:12:17: warning: incorrect type in
assignment (different address spaces)
Signed-off-by: Lorenzo Stoakes lstoa...@gmail.com
---
drivers/staging/sm750fb/ddk750_chip.h | 4 +++-
drivers/staging/sm750fb/ddk750_help.c | 4 ++--
drivers/staging/sm750fb/ddk750_help.h | 10 +-
drivers/staging/sm750fb/sm750.h | 2 +-
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/sm750fb/ddk750_chip.h
b/drivers/staging/sm750fb/ddk750_chip.h
index d761b72..04cb0d5 100644
--- a/drivers/staging/sm750fb/ddk750_chip.h
+++ b/drivers/staging/sm750fb/ddk750_chip.h
@@ -5,6 +5,8 @@
#define SM750LE_REVISION_ID ((unsigned char)0xfe)
#endif
+#include linux/io.h
+
/* This is all the chips recognized by this library */
typedef enum _logical_chip_type_t
{
@@ -72,7 +74,7 @@ logical_chip_type_t getChipType(void);
unsigned int calcPllValue(unsigned int request,pll_value_t *pll);
unsigned int calcPllValue2(unsigned int,pll_value_t *);
unsigned int formatPllReg(pll_value_t *pPLL);
-void ddk750_set_mmio(volatile unsigned char *,unsigned short,char);
+void ddk750_set_mmio(void __iomem *,unsigned short,char);
unsigned int ddk750_getVMSize(void);
int ddk750_initHw(initchip_param_t *);
unsigned int getPllValue(clock_type_t clockType, pll_value_t *pPLL);
diff --git a/drivers/staging/sm750fb/ddk750_help.c
b/drivers/staging/sm750fb/ddk750_help.c
index cc00d2b..c68ff3b 100644
--- a/drivers/staging/sm750fb/ddk750_help.c
+++ b/drivers/staging/sm750fb/ddk750_help.c
@@ -2,12 +2,12 @@
//#include ddk750_chip.h
#include ddk750_help.h
-volatile unsigned char __iomem * mmio750 = NULL;
+void __iomem * mmio750 = NULL;
char revId750 = 0;
unsigned short devId750 = 0;
/* after driver mapped io registers, use this function first */
-void ddk750_set_mmio(volatile unsigned char * addr,unsigned short devId,char
revId)
+void ddk750_set_mmio(void __iomem * addr,unsigned short devId,char revId)
{
mmio750 = addr;
devId750 = devId;
diff --git a/drivers/staging/sm750fb/ddk750_help.h
b/drivers/staging/sm750fb/ddk750_help.h
index 4fc93b5..07c8264 100644
--- a/drivers/staging/sm750fb/ddk750_help.h
+++ b/drivers/staging/sm750fb/ddk750_help.h
@@ -12,14 +12,14 @@
#if 0
/* if 718 big endian turned on,be aware that don't use this driver for general
use,only for ppc big-endian */
#warning big endian on target cpu and enable nature big endian support of 718
capability !
-#define PEEK32(addr) __raw_readl((void __iomem
*)(mmio750)+(addr))
-#define POKE32(addr,data) __raw_writel((data),(void
__iomem*)(mmio750)+(addr))
+#define PEEK32(addr) __raw_readl(mmio750 + addr)
+#define POKE32(addr,data) __raw_writel(data, mmio750 + addr)
#else /* software control endianess */
-#define PEEK32(addr) readl((addr)+mmio750)
-#define POKE32(addr,data) writel((data),(addr)+mmio750)
+#define PEEK32(addr) readl(addr + mmio750)
+#define POKE32(addr,data) writel(data, addr + mmio750)
#endif
-extern volatile unsigned char __iomem * mmio750;
+extern void __iomem * mmio750;
extern char revId750;
extern unsigned short devId750;
#else
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index d39968c..5361116 100644
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -63,7 +63,7 @@ struct lynx_share{
unsigned long vidreg_start;
__u32 vidmem_size;
__u32 vidreg_size;
- volatile unsigned char __iomem * pvReg;
+ void __iomem * pvReg;
unsigned char __iomem * pvMem;
/* locks*/
spinlock_t slock;
--
2.3.2
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 02/56] staging: comedi: comedi_pci.c: include new comedi_pci.h header
Include the new comedi_pci.h header instead of linux/pci.h and comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/comedi_pci.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/comedi_pci.c b/drivers/staging/comedi/comedi_pci.c index 6ba59c9..027f0f4 100644 --- a/drivers/staging/comedi/comedi_pci.c +++ b/drivers/staging/comedi/comedi_pci.c @@ -17,10 +17,9 @@ */ #include linux/module.h -#include linux/pci.h #include linux/interrupt.h -#include comedidev.h +#include comedi_pci.h /** * comedi_to_pci_dev() - comedi_device pointer to pci_dev pointer. -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 22/56] staging: comedi: adv_pci_dio: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/adv_pci_dio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c index 11168f9..456e870 100644 --- a/drivers/staging/comedi/drivers/adv_pci_dio.c +++ b/drivers/staging/comedi/drivers/adv_pci_dio.c @@ -30,10 +30,9 @@ Configuration options: */ #include linux/module.h -#include linux/pci.h #include linux/delay.h -#include ../comedidev.h +#include ../comedi_pci.h #include 8255.h #include comedi_8254.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 38/56] staging: comedi: gsc_hpdi: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/gsc_hpdi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c index be9988d..8b7c475 100644 --- a/drivers/staging/comedi/drivers/gsc_hpdi.c +++ b/drivers/staging/comedi/drivers/gsc_hpdi.c @@ -41,11 +41,10 @@ */ #include linux/module.h -#include linux/pci.h #include linux/delay.h #include linux/interrupt.h -#include ../comedidev.h +#include ../comedi_pci.h #include plx9080.h #include comedi_fc.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] storvsc: use KBUILD_MODNAME to fill .proc_name
Since the previous patch ead3700d893654d440edcb66fb3767a0c0db54cf (storvsc:
use cmd_size to allocate per-command data) fills .proc_name now anyway give it
a usable content for v4.0. Old mkinitrd in SLES makes use of this variable to
find the required storage driver.
Signed-off-by: Olaf Hering o...@aepfle.de
---
This should go into v4.0 because ead3700d893654d440edcb66fb3767a0c0db54cf is in
v4.0-rc1.
drivers/scsi/storvsc_drv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index efc6e44..458e3d4 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1642,7 +1642,7 @@ static struct scsi_host_template scsi_driver = {
.bios_param = storvsc_get_chs,
.queuecommand = storvsc_queuecommand,
.eh_host_reset_handler =storvsc_host_reset_handler,
- .proc_name =storvsc_host,
+ .proc_name =KBUILD_MODNAME,
.eh_timed_out = storvsc_eh_timed_out,
.slave_configure = storvsc_device_configure,
.cmd_per_lun = 255,
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
RE: [PATCH V2 1/7] Drivers: hv: vmbus: Export the vmbus_sendpacket_pagebuffer_ctl()
-Original Message- From: Greg KH [mailto:gre...@linuxfoundation.org] Sent: Tuesday, March 10, 2015 12:42 AM To: KY Srinivasan Cc: linux-ker...@vger.kernel.org; de...@linuxdriverproject.org; o...@aepfle.de; a...@canonical.com; vkuzn...@redhat.com Subject: Re: [PATCH V2 1/7] Drivers: hv: vmbus: Export the vmbus_sendpacket_pagebuffer_ctl() On Fri, Mar 06, 2015 at 11:04:28PM -0800, K. Y. Srinivasan wrote: Export the vmbus_sendpacket_pagebuffer_ctl() interface. Why? Nothing in this patch needs it. Please include this in the patch that needs the symbol, or at least give a hint as to what is going on. As it is, this just looks like a random export for no reason at all :( This will be used by Hyper-V networking driver to optimize signaling on the send path. I wanted these patches committed before I sent the networking patch to David Miller. I implemented the two vmbus APIs for sending messages: 1) vmbus_sendpacket_ctl() 2) vmbus_sendpacket_pagebuffer_ctl() and I forgot to export the second form of the send API in an earlier patch-set that you have already committed. I need both to be exported to for the netvsc patch I have. On a different note, upstream Linux is currently broken on Hyper-V and a patch in this set Fixes it: 0002-Drivers-hv-vmbus-Perform-device-register-in-the-per-.patch Do you want me to resend this set? Regards, K. Y greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2] staging: sm750fb: Fix sparse warning
On Tue, Mar 10, 2015 at 08:51:59AM +, Lorenzo Stoakes wrote: This patch fixes the following sparse warning:- drivers/staging/sm750fb/ddk750_help.c: warning: incorrect type in assignment (different address spaces) In addition it eliminates an unnecessary volatile. This doesn't apply anymore due to other patches I just took, so can you rebase this patch on my latest staging-testing branch of staging.git? Also, how about someone fixing the real compiler warnings this driver is spitting out first, before we worry about sparse warnings? That's much more relevant here as it's keeping the driver from being built in linux-next at the moment. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v2] staging: sm750fb: Cleanup the type of mmio750
On Tue, Mar 10, 2015 at 01:27:48PM +, Lorenzo Stoakes wrote: This patch assigns the more appropriate void* type to the mmio750 variable eliminating an unnecessary volatile qualifier in the process. Additionally it updates parameter types as necessary where those parameters interact with mmio750, removes unnecessary casts and updates the type of the lynx_share-pvReg field which is passed to the ddk750_set_mmio method. As a consequence, this patch fixes the following sparse warning:- drivers/staging/sm750fb/ddk750_help.c:12:17: warning: incorrect type in assignment (different address spaces) Signed-off-by: Lorenzo Stoakes lstoa...@gmail.com --- drivers/staging/sm750fb/ddk750_chip.h | 4 +++- drivers/staging/sm750fb/ddk750_help.c | 4 ++-- drivers/staging/sm750fb/ddk750_help.h | 10 +- drivers/staging/sm750fb/sm750.h | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) This doesn't apply either anymore, for the same reason :( ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: Amazing Deal On Latest Apple Products
We Offer for sale brand new Apple iPhone. We have the iPhone. 4, 4s, 5, 5c, 5s,6 6plus Also available is the Apple iPad Air WIFI + 4G We have them in 16/32/64 and 128gigs These items are original, brand new factory unlocked (works with any SIM card} and comes with full accessories and 1 year warranty. Smartphones are ICASA approved We do delivery to all regions within RSA PC Gadget PTY. Email: sa...@pcandgadget.com Email: pcandgad...@outlook.com Link: http://www.pcandgadget.com/ Tel: +27 81 263 6737 Fax: +27 86 545 7929 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 00/56] staging: comedi: introduce comedi_pci.h header
comedidev.h includes PCI-specific stuff that gets included by all comedi drivers including non-PCI ones. Separate it out into its own header comedi_pci.h. Make the new header include linux/pci.h and comedidev.h so that comedi PCI drivers do not need to include them explicitly. 01) staging: comedi: add comedi_pci.h 02) staging: comedi: comedi_pci.c: include new comedi_pci.h header 03) staging: comedi: 8255_pci: include new comedi_pci.h header 04) staging: comedi: addi_apci_1032: include new comedi_pci.h header 05) staging: comedi: addi_apci_1500: include new comedi_pci.h header 06) staging: comedi: addi_apci_1516: include new comedi_pci.h header 07) staging: comedi: addi_apci_1564: include new comedi_pci.h header 08) staging: comedi: addi_apci_16xx: include new comedi_pci.h header 09) staging: comedi: addi_apci_2032: include new comedi_pci.h header 10) staging: comedi: addi_apci_2200: include new comedi_pci.h header 11) staging: comedi: addi_apci_3120: include new comedi_pci.h header 12) staging: comedi: addi_apci_3501: include new comedi_pci.h header 13) staging: comedi: addi_apci_3xxx: include new comedi_pci.h header 14) staging: comedi: adl_pci6208: include new comedi_pci.h header 15) staging: comedi: adl_pci7x3x: include new comedi_pci.h header 16) staging: comedi: adl_pci8164: include new comedi_pci.h header 17) staging: comedi: adl_pci9111: include new comedi_pci.h header 18) staging: comedi: adl_pci9118: include new comedi_pci.h header 19) staging: comedi: adv_pci1710: include new comedi_pci.h header 20) staging: comedi: adv_pci1723: include new comedi_pci.h header 21) staging: comedi: adv_pci1724: include new comedi_pci.h header 22) staging: comedi: adv_pci_dio: include new comedi_pci.h header 23) staging: comedi: amplc_dio200_pci: include new comedi_pci.h header 24) staging: comedi: amplc_pci224: include new comedi_pci.h header 25) staging: comedi: amplc_pci230: include new comedi_pci.h header 26) staging: comedi: amplc_pci236: include new comedi_pci.h header 27) staging: comedi: amplc_pci263: include new comedi_pci.h header 28) staging: comedi: cb_pcidas64: include new comedi_pci.h header 29) staging: comedi: cb_pcidas: include new comedi_pci.h header 30) staging: comedi: cb_pcidda: include new comedi_pci.h header 31) staging: comedi: cb_pcimdas: include new comedi_pci.h header 32) staging: comedi: cb_pcimdda: include new comedi_pci.h header 33) staging: comedi: contec_pci_dio: include new comedi_pci.h header 34) staging: comedi: daqboard2000: include new comedi_pci.h header 35) staging: comedi: das08_pci: include new comedi_pci.h header 36) staging: comedi: dt3000: include new comedi_pci.h header 37) staging: comedi: dyna_pci10xx: include new comedi_pci.h header 38) staging: comedi: gsc_hpdi: include new comedi_pci.h header 39) staging: comedi: icp_multi: include new comedi_pci.h header 40) staging: comedi: jr3_pci: include new comedi_pci.h header 41) staging: comedi: ke_counter: include new comedi_pci.h header 42) staging: comedi: me4000: include new comedi_pci.h header 43) staging: comedi: me_daq: include new comedi_pci.h header 44) staging: comedi: mf6x4: include new comedi_pci.h header 45) staging: comedi: mite.c: include new comedi_pci.h header 46) staging: comedi: mite.h: include new comedi_pci.h header 47) staging: comedi: ni_6527: include new comedi_pci.h header 48) staging: comedi: ni_65xx: include new comedi_pci.h header 49) staging: comedi: ni_660x: include new comedi_pci.h header 50) staging: comedi: ni_670x: include new comedi_pci.h header 51) staging: comedi: ni_labpc_pci: include new comedi_pci.h header 52) staging: comedi: ni_pcmdio: include new comedi_pci.h header 53) staging: comedi: ni_pcmmio: include new comedi_pci.h header 54) staging: comedi: rtd520: include new comedi_pci.h header 55) staging: comedi: s626: include new comedi_pci.h header 56) staging: comedi: comedi_pci.h: move PCI stuff out of comedidev.h drivers/staging/comedi/comedi_pci.c | 3 +- drivers/staging/comedi/comedi_pci.h | 64 +++ drivers/staging/comedi/comedidev.h| 43 --- drivers/staging/comedi/drivers/8255_pci.c | 3 +- drivers/staging/comedi/drivers/addi_apci_1032.c | 3 +- drivers/staging/comedi/drivers/addi_apci_1500.c | 3 +- drivers/staging/comedi/drivers/addi_apci_1516.c | 3 +- drivers/staging/comedi/drivers/addi_apci_1564.c | 3 +- drivers/staging/comedi/drivers/addi_apci_16xx.c | 3 +- drivers/staging/comedi/drivers/addi_apci_2032.c | 3 +- drivers/staging/comedi/drivers/addi_apci_2200.c | 3 +- drivers/staging/comedi/drivers/addi_apci_3120.c | 3 +- drivers/staging/comedi/drivers/addi_apci_3501.c | 3 +- drivers/staging/comedi/drivers/addi_apci_3xxx.c | 3 +- drivers/staging/comedi/drivers/adl_pci6208.c | 3 +- drivers/staging/comedi/drivers/adl_pci7x3x.c | 3 +- drivers/staging/comedi/drivers/adl_pci8164.c | 3 +- drivers/staging/comedi/drivers/adl_pci9111.c
[PATCH 01/56] staging: comedi: add comedi_pci.h
Add a new header that Comedi PCI drivers can include instead of comedidev.h. Currently, it just pulls in linux/pci.h and comedidev.h, but the plan is to migrate the PCI-specific stuff from comedidev.h here. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/comedi_pci.h | 30 ++ 1 file changed, 30 insertions(+) create mode 100644 drivers/staging/comedi/comedi_pci.h diff --git a/drivers/staging/comedi/comedi_pci.h b/drivers/staging/comedi/comedi_pci.h new file mode 100644 index 000..a083465 --- /dev/null +++ b/drivers/staging/comedi/comedi_pci.h @@ -0,0 +1,30 @@ +/* + * comedi_pci.h + * header file for Comedi PCI drivers + * + * COMEDI - Linux Control and Measurement Device Interface + * Copyright (C) 1997-2000 David A. Schleef d...@schleef.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef _COMEDI_PCI_H +#define _COMEDI_PCI_H + +#include linux/pci.h + +#include comedidev.h + +/* + * TODO: Move PCI-specific stuff into here from comedidev.h. + */ + +#endif /* _COMEDI_PCI_H */ -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 31/56] staging: comedi: cb_pcimdas: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/cb_pcimdas.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c index acb7740..c458e50 100644 --- a/drivers/staging/comedi/drivers/cb_pcimdas.c +++ b/drivers/staging/comedi/drivers/cb_pcimdas.c @@ -42,10 +42,9 @@ */ #include linux/module.h -#include linux/pci.h #include linux/interrupt.h -#include ../comedidev.h +#include ../comedi_pci.h #include comedi_8254.h #include plx9052.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 33/56] staging: comedi: contec_pci_dio: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/contec_pci_dio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c index ba26c13..4956a49 100644 --- a/drivers/staging/comedi/drivers/contec_pci_dio.c +++ b/drivers/staging/comedi/drivers/contec_pci_dio.c @@ -26,9 +26,8 @@ Configuration Options: not applicable, uses comedi PCI auto config */ #include linux/module.h -#include linux/pci.h -#include ../comedidev.h +#include ../comedi_pci.h /* * Register map -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 15/56] staging: comedi: adl_pci7x3x: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/adl_pci7x3x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/adl_pci7x3x.c b/drivers/staging/comedi/drivers/adl_pci7x3x.c index 618e641..934af3f 100644 --- a/drivers/staging/comedi/drivers/adl_pci7x3x.c +++ b/drivers/staging/comedi/drivers/adl_pci7x3x.c @@ -53,9 +53,8 @@ */ #include linux/module.h -#include linux/pci.h -#include ../comedidev.h +#include ../comedi_pci.h /* * Register I/O map (32-bit access only) -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 04/56] staging: comedi: addi_apci_1032: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/addi_apci_1032.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/addi_apci_1032.c b/drivers/staging/comedi/drivers/addi_apci_1032.c index 993ecc6..f82cee4 100644 --- a/drivers/staging/comedi/drivers/addi_apci_1032.c +++ b/drivers/staging/comedi/drivers/addi_apci_1032.c @@ -71,10 +71,9 @@ */ #include linux/module.h -#include linux/pci.h #include linux/interrupt.h -#include ../comedidev.h +#include ../comedi_pci.h #include comedi_fc.h #include amcc_s5933.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 28/56] staging: comedi: cb_pcidas64: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/cb_pcidas64.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c index 2b7c50a..15106d0a 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas64.c +++ b/drivers/staging/comedi/drivers/cb_pcidas64.c @@ -81,11 +81,10 @@ TODO: */ #include linux/module.h -#include linux/pci.h #include linux/delay.h #include linux/interrupt.h -#include ../comedidev.h +#include ../comedi_pci.h #include 8255.h #include plx9080.h -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 16/56] staging: comedi: adl_pci8164: include new comedi_pci.h header
Include the new ../comedi_pci.h header instead of linux/pci.h and ../comedidev.h, which will now get included indirectly. Signed-off-by: Ian Abbott abbo...@mev.co.uk --- drivers/staging/comedi/drivers/adl_pci8164.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c index 4a9d63a..da901c8d 100644 --- a/drivers/staging/comedi/drivers/adl_pci8164.c +++ b/drivers/staging/comedi/drivers/adl_pci8164.c @@ -28,9 +28,8 @@ #include linux/kernel.h #include linux/module.h -#include linux/pci.h -#include ../comedidev.h +#include ../comedi_pci.h #define PCI8164_AXIS(x)((x) * 0x08) #define PCI8164_CMD_MSTS_REG 0x00 -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
