Skip to content

Commit

Permalink
[media] shark,shark2: declare resume/suspend functions as static
Browse files Browse the repository at this point in the history
drivers/media/radio/shark2.o: In function `_GLOBAL__sub_I_65535_0_usb_shark_suspend':
drivers/media/radio/radio-shark2.c:344: multiple definition of `usb_shark_suspend'
drivers/media/radio/radio-shark.o:/home/v4l/v4l/patchwork/drivers/media/radio/radio-shark.c:379: first defined here
drivers/media/radio/shark2.o: In function `usb_shark_resume':
drivers/media/radio/radio-shark2.c:349: multiple definition of `usb_shark_resume'
drivers/media/radio/radio-shark.o:/home/v4l/v4l/patchwork/drivers/media/radio/radio-shark.c:384: first defined here

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Sep 13, 2012
1 parent 559c200 commit 1f71927
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/media/radio/radio-shark.c
Original file line number Diff line number Diff line change
Expand Up @@ -375,12 +375,12 @@ static int usb_shark_probe(struct usb_interface *intf,
}

#ifdef CONFIG_PM
int usb_shark_suspend(struct usb_interface *intf, pm_message_t message)
static int usb_shark_suspend(struct usb_interface *intf, pm_message_t message)
{
return 0;
}

int usb_shark_resume(struct usb_interface *intf)
static int usb_shark_resume(struct usb_interface *intf)
{
struct v4l2_device *v4l2_dev = usb_get_intfdata(intf);
struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev);
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/radio/radio-shark2.c
Original file line number Diff line number Diff line change
Expand Up @@ -340,12 +340,12 @@ static int usb_shark_probe(struct usb_interface *intf,
}

#ifdef CONFIG_PM
int usb_shark_suspend(struct usb_interface *intf, pm_message_t message)
static int usb_shark_suspend(struct usb_interface *intf, pm_message_t message)
{
return 0;
}

int usb_shark_resume(struct usb_interface *intf)
static int usb_shark_resume(struct usb_interface *intf)
{
struct v4l2_device *v4l2_dev = usb_get_intfdata(intf);
struct shark_device *shark = v4l2_dev_to_shark(v4l2_dev);
Expand Down

0 comments on commit 1f71927

Please sign in to comment.