diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/bluetooth/btusb.c | 4 | ||||
-rw-r--r-- | drivers/cpuidle/sysfs.c | 2 | ||||
-rw-r--r-- | drivers/edac/i7300_edac.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 1da773f899a2..92d29bfa2f48 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
@@ -424,7 +424,7 @@ static void btusb_isoc_complete(struct urb *urb) | |||
424 | } | 424 | } |
425 | } | 425 | } |
426 | 426 | ||
427 | static void inline __fill_isoc_descriptor(struct urb *urb, int len, int mtu) | 427 | static inline void __fill_isoc_descriptor(struct urb *urb, int len, int mtu) |
428 | { | 428 | { |
429 | int i, offset = 0; | 429 | int i, offset = 0; |
430 | 430 | ||
@@ -775,7 +775,7 @@ static void btusb_notify(struct hci_dev *hdev, unsigned int evt) | |||
775 | } | 775 | } |
776 | } | 776 | } |
777 | 777 | ||
778 | static int inline __set_isoc_interface(struct hci_dev *hdev, int altsetting) | 778 | static inline int __set_isoc_interface(struct hci_dev *hdev, int altsetting) |
779 | { | 779 | { |
780 | struct btusb_data *data = hdev->driver_data; | 780 | struct btusb_data *data = hdev->driver_data; |
781 | struct usb_interface *intf = data->isoc; | 781 | struct usb_interface *intf = data->isoc; |
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c index 0310ffaec9df..be7917ec40c9 100644 --- a/drivers/cpuidle/sysfs.c +++ b/drivers/cpuidle/sysfs.c | |||
@@ -300,7 +300,7 @@ static struct kobj_type ktype_state_cpuidle = { | |||
300 | .release = cpuidle_state_sysfs_release, | 300 | .release = cpuidle_state_sysfs_release, |
301 | }; | 301 | }; |
302 | 302 | ||
303 | static void inline cpuidle_free_state_kobj(struct cpuidle_device *device, int i) | 303 | static inline void cpuidle_free_state_kobj(struct cpuidle_device *device, int i) |
304 | { | 304 | { |
305 | kobject_put(&device->kobjs[i]->kobj); | 305 | kobject_put(&device->kobjs[i]->kobj); |
306 | wait_for_completion(&device->kobjs[i]->kobj_unregister); | 306 | wait_for_completion(&device->kobjs[i]->kobj_unregister); |
diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c index 05523b504271..76d1f576cdc8 100644 --- a/drivers/edac/i7300_edac.c +++ b/drivers/edac/i7300_edac.c | |||
@@ -162,7 +162,7 @@ static struct edac_pci_ctl_info *i7300_pci; | |||
162 | #define AMBPRESENT_0 0x64 | 162 | #define AMBPRESENT_0 0x64 |
163 | #define AMBPRESENT_1 0x66 | 163 | #define AMBPRESENT_1 0x66 |
164 | 164 | ||
165 | const static u16 mtr_regs[MAX_SLOTS] = { | 165 | static const u16 mtr_regs[MAX_SLOTS] = { |
166 | 0x80, 0x84, 0x88, 0x8c, | 166 | 0x80, 0x84, 0x88, 0x8c, |
167 | 0x82, 0x86, 0x8a, 0x8e | 167 | 0x82, 0x86, 0x8a, 0x8e |
168 | }; | 168 | }; |