From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
To: David Howells <dhowells@redhat.com>,
Ulf Hansson <ulf.hansson@linaro.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Johan Hovold <johan@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-am33-list@redhat.com, linux-kernel@vger.kernel.org,
linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-usb@vger.kernel.org,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Subject: [PATCH v2 4/7] USB: mos7720: rename DCR
Date: Thu, 18 Jun 2015 17:47:50 +0530 [thread overview]
Message-ID: <1434629873-11668-5-git-send-email-sudipm.mukherjee@gmail.com> (raw)
In-Reply-To: <1434629873-11668-1-git-send-email-sudipm.mukherjee@gmail.com>
While building with mn10300 it failed with:
error: expected identifier before '(' token
#define __SYSREG(ADDR, TYPE) (*(volatile TYPE *)(ADDR))
note: in expansion of macro '__SYSREG'
#define DCR __SYSREG(0xc0000030, u16) /* Debug control register */
mn10300 has a register named as DCR, so when this driver used an enum
named as DCR, build failed.
Just rename the DCR in the driver to parport_DCR.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
drivers/usb/serial/mos7720.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 4f70df3..3263125 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -135,7 +135,7 @@ enum mos_regs {
DLM,
DPR, /* parallel port regs */
DSR,
- DCR,
+ parport_DCR,
ECR,
SP1_REG, /* device control regs */
SP2_REG, /* serial port 2 (7720 only) */
@@ -164,7 +164,7 @@ static inline __u16 get_reg_index(enum mos_regs reg)
0x01, /* DLM */
0x00, /* DPR */
0x01, /* DSR */
- 0x02, /* DCR */
+ 0x02, /* parport_DCR */
0x0a, /* ECR */
0x01, /* SP1_REG */
0x02, /* SP2_REG (7720 only) */
@@ -510,7 +510,7 @@ static void parport_mos7715_write_control(struct parport *pp, unsigned char d)
if (parport_prologue(pp) < 0)
return;
data = ((__u8)d & 0x0f) | (mos_parport->shadowDCR & 0xf0);
- write_mos_reg(mos_parport->serial, dummy, DCR, data);
+ write_mos_reg(mos_parport->serial, dummy, parport_DCR, data);
mos_parport->shadowDCR = data;
parport_epilogue(pp);
}
@@ -543,7 +543,7 @@ static unsigned char parport_mos7715_frob_control(struct parport *pp,
if (parport_prologue(pp) < 0)
return 0;
mos_parport->shadowDCR = (mos_parport->shadowDCR & (~mask)) ^ val;
- write_mos_reg(mos_parport->serial, dummy, DCR, mos_parport->shadowDCR);
+ write_mos_reg(mos_parport->serial, dummy, parport_DCR, mos_parport->shadowDCR);
dcr = mos_parport->shadowDCR & 0x0f;
parport_epilogue(pp);
return dcr;
@@ -581,7 +581,7 @@ static void parport_mos7715_data_forward(struct parport *pp)
return;
mos7715_change_mode(mos_parport, PS2);
mos_parport->shadowDCR &= ~0x20;
- write_mos_reg(mos_parport->serial, dummy, DCR, mos_parport->shadowDCR);
+ write_mos_reg(mos_parport->serial, dummy, parport_DCR, mos_parport->shadowDCR);
parport_epilogue(pp);
}
@@ -593,7 +593,7 @@ static void parport_mos7715_data_reverse(struct parport *pp)
return;
mos7715_change_mode(mos_parport, PS2);
mos_parport->shadowDCR |= 0x20;
- write_mos_reg(mos_parport->serial, dummy, DCR, mos_parport->shadowDCR);
+ write_mos_reg(mos_parport->serial, dummy, parport_DCR, mos_parport->shadowDCR);
parport_epilogue(pp);
}
@@ -633,7 +633,7 @@ static void parport_mos7715_restore_state(struct parport *pp,
spin_unlock(&release_lock);
return;
}
- write_parport_reg_nonblock(mos_parport, DCR, mos_parport->shadowDCR);
+ write_parport_reg_nonblock(mos_parport, parport_DCR, mos_parport->shadowDCR);
write_parport_reg_nonblock(mos_parport, ECR, mos_parport->shadowECR);
spin_unlock(&release_lock);
}
@@ -719,7 +719,7 @@ static int mos7715_parport_init(struct usb_serial *serial)
/* initialize device registers */
mos_parport->shadowDCR = DCR_INIT_VAL;
- write_mos_reg(mos_parport->serial, dummy, DCR, mos_parport->shadowDCR);
+ write_mos_reg(mos_parport->serial, dummy, parport_DCR, mos_parport->shadowDCR);
mos_parport->shadowECR = ECR_INIT_VAL;
write_mos_reg(mos_parport->serial, dummy, ECR, mos_parport->shadowECR);
--
1.8.1.2
WARNING: multiple messages have this Message-ID (diff)
From: sudipm.mukherjee@gmail.com (Sudip Mukherjee)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 4/7] USB: mos7720: rename DCR
Date: Thu, 18 Jun 2015 17:47:50 +0530 [thread overview]
Message-ID: <1434629873-11668-5-git-send-email-sudipm.mukherjee@gmail.com> (raw)
In-Reply-To: <1434629873-11668-1-git-send-email-sudipm.mukherjee@gmail.com>
While building with mn10300 it failed with:
error: expected identifier before '(' token
#define __SYSREG(ADDR, TYPE) (*(volatile TYPE *)(ADDR))
note: in expansion of macro '__SYSREG'
#define DCR __SYSREG(0xc0000030, u16) /* Debug control register */
mn10300 has a register named as DCR, so when this driver used an enum
named as DCR, build failed.
Just rename the DCR in the driver to parport_DCR.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
drivers/usb/serial/mos7720.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index 4f70df3..3263125 100644
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -135,7 +135,7 @@ enum mos_regs {
DLM,
DPR, /* parallel port regs */
DSR,
- DCR,
+ parport_DCR,
ECR,
SP1_REG, /* device control regs */
SP2_REG, /* serial port 2 (7720 only) */
@@ -164,7 +164,7 @@ static inline __u16 get_reg_index(enum mos_regs reg)
0x01, /* DLM */
0x00, /* DPR */
0x01, /* DSR */
- 0x02, /* DCR */
+ 0x02, /* parport_DCR */
0x0a, /* ECR */
0x01, /* SP1_REG */
0x02, /* SP2_REG (7720 only) */
@@ -510,7 +510,7 @@ static void parport_mos7715_write_control(struct parport *pp, unsigned char d)
if (parport_prologue(pp) < 0)
return;
data = ((__u8)d & 0x0f) | (mos_parport->shadowDCR & 0xf0);
- write_mos_reg(mos_parport->serial, dummy, DCR, data);
+ write_mos_reg(mos_parport->serial, dummy, parport_DCR, data);
mos_parport->shadowDCR = data;
parport_epilogue(pp);
}
@@ -543,7 +543,7 @@ static unsigned char parport_mos7715_frob_control(struct parport *pp,
if (parport_prologue(pp) < 0)
return 0;
mos_parport->shadowDCR = (mos_parport->shadowDCR & (~mask)) ^ val;
- write_mos_reg(mos_parport->serial, dummy, DCR, mos_parport->shadowDCR);
+ write_mos_reg(mos_parport->serial, dummy, parport_DCR, mos_parport->shadowDCR);
dcr = mos_parport->shadowDCR & 0x0f;
parport_epilogue(pp);
return dcr;
@@ -581,7 +581,7 @@ static void parport_mos7715_data_forward(struct parport *pp)
return;
mos7715_change_mode(mos_parport, PS2);
mos_parport->shadowDCR &= ~0x20;
- write_mos_reg(mos_parport->serial, dummy, DCR, mos_parport->shadowDCR);
+ write_mos_reg(mos_parport->serial, dummy, parport_DCR, mos_parport->shadowDCR);
parport_epilogue(pp);
}
@@ -593,7 +593,7 @@ static void parport_mos7715_data_reverse(struct parport *pp)
return;
mos7715_change_mode(mos_parport, PS2);
mos_parport->shadowDCR |= 0x20;
- write_mos_reg(mos_parport->serial, dummy, DCR, mos_parport->shadowDCR);
+ write_mos_reg(mos_parport->serial, dummy, parport_DCR, mos_parport->shadowDCR);
parport_epilogue(pp);
}
@@ -633,7 +633,7 @@ static void parport_mos7715_restore_state(struct parport *pp,
spin_unlock(&release_lock);
return;
}
- write_parport_reg_nonblock(mos_parport, DCR, mos_parport->shadowDCR);
+ write_parport_reg_nonblock(mos_parport, parport_DCR, mos_parport->shadowDCR);
write_parport_reg_nonblock(mos_parport, ECR, mos_parport->shadowECR);
spin_unlock(&release_lock);
}
@@ -719,7 +719,7 @@ static int mos7715_parport_init(struct usb_serial *serial)
/* initialize device registers */
mos_parport->shadowDCR = DCR_INIT_VAL;
- write_mos_reg(mos_parport->serial, dummy, DCR, mos_parport->shadowDCR);
+ write_mos_reg(mos_parport->serial, dummy, parport_DCR, mos_parport->shadowDCR);
mos_parport->shadowECR = ECR_INIT_VAL;
write_mos_reg(mos_parport->serial, dummy, ECR, mos_parport->shadowECR);
--
1.8.1.2
next prev parent reply other threads:[~2015-06-18 12:19 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-18 12:17 [PATCH v2 0/7] fix build failure of mn10300 Sudip Mukherjee
2015-06-18 12:17 ` Sudip Mukherjee
2015-06-18 12:17 ` [PATCH v2 1/7] mn10300: fix build failure Sudip Mukherjee
2015-06-18 12:17 ` Sudip Mukherjee
2015-07-16 7:17 ` Sudip Mukherjee
2015-07-16 21:54 ` Andrew Morton
2015-07-17 5:06 ` Sudip Mukherjee
2015-06-18 12:17 ` [PATCH v2 2/7] mn10300: Provide dummy dma_alloc_attrs() and dma_free_attrs() Sudip Mukherjee
2015-06-18 12:17 ` Sudip Mukherjee
2015-06-18 12:17 ` Sudip Mukherjee
2015-06-18 12:17 ` [PATCH v2 3/7] mmc: mediatek: build as module Sudip Mukherjee
2015-06-18 12:17 ` Sudip Mukherjee
2015-06-18 13:10 ` Ulf Hansson
2015-06-18 13:10 ` Ulf Hansson
2015-06-18 13:10 ` Ulf Hansson
2015-06-18 12:17 ` Sudip Mukherjee [this message]
2015-06-18 12:17 ` [PATCH v2 4/7] USB: mos7720: rename DCR Sudip Mukherjee
2015-06-23 10:09 ` Johan Hovold
2015-06-23 10:09 ` Johan Hovold
2015-06-23 13:29 ` [PATCH v3] USB: mos7720: rename registers Sudip Mukherjee
2015-06-26 7:46 ` Johan Hovold
2015-06-26 13:53 ` Sudip Mukherjee
2015-06-18 12:17 ` [PATCH v2 5/7] samples: kdbus: disable for mn10300 Sudip Mukherjee
2015-06-18 12:17 ` Sudip Mukherjee
2015-06-18 14:39 ` Greg Kroah-Hartman
2015-06-18 14:39 ` Greg Kroah-Hartman
2015-06-18 16:19 ` Sudip Mukherjee
2015-06-18 16:19 ` Sudip Mukherjee
2015-06-18 16:19 ` Sudip Mukherjee
2015-06-18 16:25 ` Greg Kroah-Hartman
2015-06-18 16:25 ` Greg Kroah-Hartman
2015-06-18 12:17 ` [PATCH v2 6/7] mn10300: kgdb_arch_set_pc Sudip Mukherjee
2015-06-18 12:17 ` Sudip Mukherjee
2015-06-18 12:17 ` [PATCH v2 7/7] mn10300: add early_init_dt_* Sudip Mukherjee
2015-06-18 12:17 ` Sudip Mukherjee
2015-06-18 12:17 ` Sudip Mukherjee
2015-06-18 14:51 ` [PATCH v2 0/7] fix build failure of mn10300 Russell King - ARM Linux
2015-06-18 14:51 ` Russell King - ARM Linux
[not found] ` <CAA0PaPGMtePS+fmpi1QBZi8uHtuU3Z7_Y+9f0+O38o+8xfo+1Q@mail.gmail.com>
2015-06-18 15:44 ` [Linux-am33-list] " Russell King - ARM Linux
2015-06-18 15:44 ` Russell King - ARM Linux
2015-06-18 15:44 ` Russell King - ARM Linux
2015-06-18 16:13 ` Sudip Mukherjee
2015-06-18 16:13 ` Sudip Mukherjee
2015-06-18 16:13 ` Sudip Mukherjee
2015-07-10 11:20 ` Sudip Mukherjee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1434629873-11668-5-git-send-email-sudipm.mukherjee@gmail.com \
--to=sudipm.mukherjee@gmail.com \
--cc=dhowells@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=linux-am33-list@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.