From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: Frank Seidel <fseidel@suse.de>, Greg Kroah-Hartman <gregkh@suse.de>
Subject: [PATCH 06/10] nozomi: finish constification
Date: Sat, 2 Feb 2008 15:56:00 -0800 [thread overview]
Message-ID: <1201996564-21951-6-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <20080202234357.GA21721@suse.de>
From: Frank Seidel <fseidel@suse.de>
Even some more constifications
Signed-off-by: Frank Seidel <fseidel@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/char/nozomi.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c
index 7979eb1..dfaab23 100644
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
@@ -395,7 +395,7 @@ struct buffer {
} __attribute__ ((packed));
/* Global variables */
-static struct pci_device_id nozomi_pci_tbl[] __devinitdata = {
+static const struct pci_device_id nozomi_pci_tbl[] __devinitconst = {
{PCI_DEVICE(VENDOR1, DEVICE1)},
{},
};
@@ -778,13 +778,13 @@ static void disable_transmit_dl(enum port_type port, struct nozomi *dc)
* Return 1 - send buffer to card and ack.
* Return 0 - don't ack, don't send buffer to card.
*/
-static int send_data(enum port_type index, struct nozomi *dc)
+static int send_data(enum port_type index, const struct nozomi *dc)
{
u32 size = 0;
const struct port *port = &dc->port[index];
- u8 toggle = port->toggle_ul;
+ const u8 toggle = port->toggle_ul;
void __iomem *addr = port->ul_addr[toggle];
- u32 ul_size = port->ul_size[toggle];
+ const u32 ul_size = port->ul_size[toggle];
struct tty_struct *tty = port->tty;
/* Get data from tty and place in buf for now */
@@ -1732,7 +1732,7 @@ static int ntty_tiocmset(struct tty_struct *tty, struct file *file,
static int ntty_cflags_changed(struct port *port, unsigned long flags,
struct async_icount *cprev)
{
- struct async_icount cnow = port->tty_icount;
+ const struct async_icount cnow = port->tty_icount;
int ret;
ret = ((flags & TIOCM_RNG) && (cnow.rng != cprev->rng)) ||
@@ -1747,7 +1747,7 @@ static int ntty_cflags_changed(struct port *port, unsigned long flags,
static int ntty_ioctl_tiocgicount(struct port *port, void __user *argp)
{
- struct async_icount cnow = port->tty_icount;
+ const struct async_icount cnow = port->tty_icount;
struct serial_icounter_struct icount;
icount.cts = cnow.cts;
@@ -1858,7 +1858,7 @@ exit_in_buffer:
return rval;
}
-static struct tty_operations tty_ops = {
+static const struct tty_operations tty_ops = {
.ioctl = ntty_ioctl,
.open = ntty_open,
.close = ntty_close,
--
1.5.3.8
next prev parent reply other threads:[~2008-02-02 23:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-02 23:43 [GIT PATCH] driver core fixes against 2.6.24-git Greg KH
2008-02-02 23:55 ` [PATCH 01/10] kobject: Always build in kernel/ksysfs.o Greg Kroah-Hartman
2008-02-02 23:55 ` [PATCH 02/10] kobject: kerneldoc comment fix Greg Kroah-Hartman
2008-02-02 23:55 ` [PATCH 03/10] Add ja_JP translation of stable_kernel_rules.txt Greg Kroah-Hartman
2008-02-02 23:55 ` [PATCH 04/10] nozomi driver update Greg Kroah-Hartman
2008-02-02 23:55 ` [PATCH 05/10] nozomi: constify driver Greg Kroah-Hartman
2008-02-02 23:56 ` Greg Kroah-Hartman [this message]
2008-02-02 23:56 ` [PATCH 07/10] PM: Export device_pm_schedule_removal Greg Kroah-Hartman
2008-02-02 23:56 ` [PATCH 08/10] driver core: convert to use class_find_device api Greg Kroah-Hartman
2008-02-02 23:56 ` [PATCH 09/10] Driver core: Update some prototypes in platform.txt Greg Kroah-Hartman
2008-02-02 23:56 ` [PATCH 10/10] Driver core: Remove unneeded get_{device,driver}() calls Greg Kroah-Hartman
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=1201996564-21951-6-git-send-email-gregkh@suse.de \
--to=gregkh@suse.de \
--cc=fseidel@suse.de \
--cc=linux-kernel@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome