lkml.org 
[lkml]   [2009]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 30/31] Constify struct usb_mon_operations for 2.6.32 v1
    From: Emese Revfy <re.emese@gmail.com>

    Constify struct usb_mon_operations.

    Signed-off-by: Emese Revfy <re.emese@gmail.com>
    ---
    drivers/usb/core/hcd.c | 4 ++--
    drivers/usb/core/hcd.h | 10 +++++-----
    drivers/usb/mon/mon_main.c | 2 +-
    3 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
    index 34de475..cfcb4fb 100644
    --- a/drivers/usb/core/hcd.c
    +++ b/drivers/usb/core/hcd.c
    @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutdown);

    #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)

    -struct usb_mon_operations *mon_ops;
    +const struct usb_mon_operations *mon_ops;

    /*
    * The registration is unlocked.
    @@ -2226,7 +2226,7 @@ struct usb_mon_operations *mon_ops;
    * symbols from usbcore, usbcore gets referenced and cannot be unloaded first.
    */

    -int usb_mon_register (struct usb_mon_operations *ops)
    +int usb_mon_register (const struct usb_mon_operations *ops)
    {

    if (mon_ops)
    diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
    index 79782a1..04bf5ea 100644
    --- a/drivers/usb/core/hcd.h
    +++ b/drivers/usb/core/hcd.h
    @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { }
    #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)

    struct usb_mon_operations {
    - void (*urb_submit)(struct usb_bus *bus, struct urb *urb);
    - void (*urb_submit_error)(struct usb_bus *bus, struct urb *urb, int err);
    - void (*urb_complete)(struct usb_bus *bus, struct urb *urb, int status);
    + void (* const urb_submit)(struct usb_bus *bus, struct urb *urb);
    + void (* const urb_submit_error)(struct usb_bus *bus, struct urb *urb, int err);
    + void (* const urb_complete)(struct usb_bus *bus, struct urb *urb, int status);
    /* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */
    };

    -extern struct usb_mon_operations *mon_ops;
    +extern const struct usb_mon_operations *mon_ops;

    static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb)
    {
    @@ -514,7 +514,7 @@ static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb,
    (*mon_ops->urb_complete)(bus, urb, status);
    }

    -int usb_mon_register(struct usb_mon_operations *ops);
    +int usb_mon_register(const struct usb_mon_operations *ops);
    void usb_mon_deregister(void);

    #else
    diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c
    index e0c2db3..bd8cb66 100644
    --- a/drivers/usb/mon/mon_main.c
    +++ b/drivers/usb/mon/mon_main.c
    @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
    /*
    * Ops
    */
    -static struct usb_mon_operations mon_ops_0 = {
    +static const struct usb_mon_operations mon_ops_0 = {
    .urb_submit = mon_submit,
    .urb_submit_error = mon_submit_error,
    .urb_complete = mon_complete,


    \
     
     \ /
      Last update: 2009-12-04 23:51    [W:4.323 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site