Skip to content

Commit

Permalink
nozomi: finish constification
Browse files Browse the repository at this point in the history
Even some more constifications

Signed-off-by: Frank Seidel <fseidel@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Frank Seidel authored and Greg Kroah-Hartman committed Feb 2, 2008
1 parent 71e1b4a commit 18bbe0c
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/char/nozomi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)},
{},
};
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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)) ||
Expand All @@ -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;
Expand Down Expand Up @@ -1858,7 +1858,7 @@ static s32 ntty_chars_in_buffer(struct tty_struct *tty)
return rval;
}

static struct tty_operations tty_ops = {
static const struct tty_operations tty_ops = {
.ioctl = ntty_ioctl,
.open = ntty_open,
.close = ntty_close,
Expand Down

0 comments on commit 18bbe0c

Please sign in to comment.