mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-24 04:34:08 +08:00
Merge branch 'for-5.13/warnings' into for-linus
- plethora of fixes for valid gcc warnings from Lee Jones
This commit is contained in:
commit
e16e9f1184
@ -74,7 +74,7 @@ enum dev_num {
|
||||
UNKNOWN,
|
||||
};
|
||||
/**
|
||||
* struct u1_data
|
||||
* struct alps_dev
|
||||
*
|
||||
* @input: pointer to the kernel input device
|
||||
* @input2: pointer to the kernel input2 device
|
||||
|
@ -2129,7 +2129,7 @@ struct hid_dynid {
|
||||
};
|
||||
|
||||
/**
|
||||
* store_new_id - add a new HID device ID to this driver and re-probe devices
|
||||
* new_id_store - add a new HID device ID to this driver and re-probe devices
|
||||
* @drv: target device driver
|
||||
* @buf: buffer for scanning device ID data
|
||||
* @count: input size
|
||||
|
@ -655,7 +655,7 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc,
|
||||
}
|
||||
|
||||
/**
|
||||
* Enable fully-functional tablet mode by setting a special feature report.
|
||||
* kye_tablet_enable() - Enable fully-functional tablet mode by setting a special feature report.
|
||||
*
|
||||
* @hdev: HID device
|
||||
*
|
||||
|
@ -261,7 +261,7 @@ static int __hidpp_send_report(struct hid_device *hdev,
|
||||
return ret == fields_count ? 0 : -1;
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* hidpp_send_message_sync() returns 0 in case of success, and something else
|
||||
* in case of a failure.
|
||||
* - If ' something else' is positive, that means that an error has been raised
|
||||
@ -423,7 +423,7 @@ static inline bool hidpp_report_is_connect_event(struct hidpp_device *hidpp,
|
||||
(report->rap.sub_id == 0x41));
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* hidpp_prefix_name() prefixes the current given name with "Logitech ".
|
||||
*/
|
||||
static void hidpp_prefix_name(char **name, int name_length)
|
||||
@ -454,6 +454,7 @@ static void hidpp_prefix_name(char **name, int name_length)
|
||||
* hidpp_scroll_counter_handle_scroll() - Send high- and low-resolution scroll
|
||||
* events given a high-resolution wheel
|
||||
* movement.
|
||||
* @input_dev: Pointer to the input device
|
||||
* @counter: a hid_scroll_counter struct describing the wheel.
|
||||
* @hi_res_value: the movement of the wheel, in the mouse's high-resolution
|
||||
* units.
|
||||
@ -1884,7 +1885,7 @@ struct hidpp_touchpad_fw_items {
|
||||
uint8_t persistent;
|
||||
};
|
||||
|
||||
/**
|
||||
/*
|
||||
* send a set state command to the device by reading the current items->state
|
||||
* field. items is then filled with the current state.
|
||||
*/
|
||||
|
@ -329,7 +329,6 @@ static int picolcd_raw_event(struct hid_device *hdev,
|
||||
{
|
||||
struct picolcd_data *data = hid_get_drvdata(hdev);
|
||||
unsigned long flags;
|
||||
int ret = 0;
|
||||
|
||||
if (!data)
|
||||
return 1;
|
||||
@ -342,9 +341,9 @@ static int picolcd_raw_event(struct hid_device *hdev,
|
||||
|
||||
if (report->id == REPORT_KEY_STATE) {
|
||||
if (data->input_keys)
|
||||
ret = picolcd_raw_keypad(data, report, raw_data+1, size-1);
|
||||
picolcd_raw_keypad(data, report, raw_data+1, size-1);
|
||||
} else if (report->id == REPORT_IR_DATA) {
|
||||
ret = picolcd_raw_cir(data, report, raw_data+1, size-1);
|
||||
picolcd_raw_cir(data, report, raw_data+1, size-1);
|
||||
} else {
|
||||
spin_lock_irqsave(&data->lock, flags);
|
||||
/*
|
||||
|
@ -397,15 +397,14 @@ static ssize_t store_value(struct device *dev, struct device_attribute *attr,
|
||||
|
||||
if (!strncmp(name, "value", strlen("value"))) {
|
||||
u32 report_id;
|
||||
int ret;
|
||||
|
||||
if (kstrtoint(buf, 0, &value) != 0)
|
||||
return -EINVAL;
|
||||
|
||||
report_id = sensor_inst->fields[field_index].attribute.
|
||||
report_id;
|
||||
ret = sensor_hub_set_feature(sensor_inst->hsdev, report_id,
|
||||
index, sizeof(value), &value);
|
||||
sensor_hub_set_feature(sensor_inst->hsdev, report_id,
|
||||
index, sizeof(value), &value);
|
||||
} else
|
||||
return -EINVAL;
|
||||
|
||||
|
@ -18,7 +18,6 @@
|
||||
|
||||
/**
|
||||
* struct sensor_hub_data - Hold a instance data for a HID hub device
|
||||
* @hsdev: Stored hid instance for current hub device.
|
||||
* @mutex: Mutex to serialize synchronous request.
|
||||
* @lock: Spin lock to protect pending request structure.
|
||||
* @dyn_callback_list: Holds callback function
|
||||
@ -34,7 +33,6 @@ struct sensor_hub_data {
|
||||
spinlock_t dyn_callback_lock;
|
||||
struct mfd_cell *hid_sensor_hub_client_devs;
|
||||
int hid_sensor_client_cnt;
|
||||
unsigned long quirks;
|
||||
int ref_cnt;
|
||||
};
|
||||
|
||||
@ -42,6 +40,7 @@ struct sensor_hub_data {
|
||||
* struct hid_sensor_hub_callbacks_list - Stores callback list
|
||||
* @list: list head.
|
||||
* @usage_id: usage id for a physical device.
|
||||
* @hsdev: Stored hid instance for current hub device.
|
||||
* @usage_callback: Stores registered callback functions.
|
||||
* @priv: Private data for a physical device.
|
||||
*/
|
||||
@ -615,7 +614,6 @@ static int sensor_hub_probe(struct hid_device *hdev,
|
||||
}
|
||||
|
||||
hid_set_drvdata(hdev, sd);
|
||||
sd->quirks = id->driver_data;
|
||||
|
||||
spin_lock_init(&sd->lock);
|
||||
spin_lock_init(&sd->dyn_callback_lock);
|
||||
|
@ -21,7 +21,8 @@
|
||||
#include <asm/unaligned.h>
|
||||
|
||||
/**
|
||||
* Convert a pen in-range reporting type to a string.
|
||||
* uclogic_params_pen_inrange_to_str() - Convert a pen in-range reporting type
|
||||
* to a string.
|
||||
*
|
||||
* @inrange: The in-range reporting type to convert.
|
||||
*
|
||||
@ -516,7 +517,8 @@ void uclogic_params_cleanup(struct uclogic_params *params)
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a replacement report descriptor for a tablet's interface.
|
||||
* uclogic_params_get_desc() - Get a replacement report descriptor for a
|
||||
* tablet's interface.
|
||||
*
|
||||
* @params: The parameters of a tablet interface to get report
|
||||
* descriptor for. Cannot be NULL.
|
||||
@ -689,7 +691,7 @@ static void uclogic_params_init_with_pen_unused(struct uclogic_params *params)
|
||||
}
|
||||
|
||||
/**
|
||||
* uclogic_params_init() - initialize a Huion tablet interface and discover
|
||||
* uclogic_params_huion_init() - initialize a Huion tablet interface and discover
|
||||
* its parameters.
|
||||
*
|
||||
* @params: Parameters to fill in (to be cleaned with
|
||||
|
@ -641,7 +641,7 @@ const __u8 uclogic_rdesc_pen_v2_template_arr[] = {
|
||||
const size_t uclogic_rdesc_pen_v2_template_size =
|
||||
sizeof(uclogic_rdesc_pen_v2_template_arr);
|
||||
|
||||
/**
|
||||
/*
|
||||
* Expand to the contents of a generic buttonpad report descriptor.
|
||||
*
|
||||
* @_padding: Padding from the end of button bits at bit 44, until
|
||||
|
@ -505,7 +505,7 @@ static void pidff_playback_pid(struct pidff_device *pidff, int pid_id, int n)
|
||||
HID_REQ_SET_REPORT);
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* Play the effect with effect id @effect_id for @value times
|
||||
*/
|
||||
static int pidff_playback(struct input_dev *dev, int effect_id, int value)
|
||||
@ -997,7 +997,7 @@ static int pidff_find_special_fields(struct pidff_device *pidff)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* Find the implemented effect types
|
||||
*/
|
||||
static int pidff_find_effects(struct pidff_device *pidff,
|
||||
|
@ -63,7 +63,7 @@ static const unsigned char usb_kbd_keycode[256] = {
|
||||
* new key is pressed or a key that was pressed is released.
|
||||
* @led: URB for sending LEDs (e.g. numlock, ...)
|
||||
* @newleds: data that will be sent with the @led URB representing which LEDs
|
||||
should be on
|
||||
* should be on
|
||||
* @name: Name of the keyboard. @dev's name field points to this buffer
|
||||
* @phys: Physical path of the keyboard. @dev's phys field points to this
|
||||
* buffer
|
||||
@ -91,7 +91,7 @@ struct usb_kbd {
|
||||
unsigned char *leds;
|
||||
dma_addr_t new_dma;
|
||||
dma_addr_t leds_dma;
|
||||
|
||||
|
||||
spinlock_t leds_lock;
|
||||
bool led_urb_submitted;
|
||||
|
||||
@ -175,15 +175,15 @@ static int usb_kbd_event(struct input_dev *dev, unsigned int type,
|
||||
}
|
||||
|
||||
*(kbd->leds) = kbd->newleds;
|
||||
|
||||
|
||||
kbd->led->dev = kbd->usbdev;
|
||||
if (usb_submit_urb(kbd->led, GFP_ATOMIC))
|
||||
pr_err("usb_submit_urb(leds) failed\n");
|
||||
else
|
||||
kbd->led_urb_submitted = true;
|
||||
|
||||
|
||||
spin_unlock_irqrestore(&kbd->leds_lock, flags);
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -205,14 +205,14 @@ static void usb_kbd_led(struct urb *urb)
|
||||
}
|
||||
|
||||
*(kbd->leds) = kbd->newleds;
|
||||
|
||||
|
||||
kbd->led->dev = kbd->usbdev;
|
||||
if (usb_submit_urb(kbd->led, GFP_ATOMIC)){
|
||||
hid_err(urb->dev, "usb_submit_urb(leds) failed\n");
|
||||
kbd->led_urb_submitted = false;
|
||||
}
|
||||
spin_unlock_irqrestore(&kbd->leds_lock, flags);
|
||||
|
||||
|
||||
}
|
||||
|
||||
static int usb_kbd_open(struct input_dev *dev)
|
||||
@ -358,9 +358,9 @@ static int usb_kbd_probe(struct usb_interface *iface,
|
||||
device_set_wakeup_enable(&dev->dev, 1);
|
||||
return 0;
|
||||
|
||||
fail2:
|
||||
fail2:
|
||||
usb_kbd_free_mem(dev, kbd);
|
||||
fail1:
|
||||
fail1:
|
||||
input_free_device(input_dev);
|
||||
kfree(kbd);
|
||||
return error;
|
||||
|
@ -1495,7 +1495,7 @@ struct wacom_led *wacom_led_find(struct wacom *wacom, unsigned int group_id,
|
||||
return &group->leds[id];
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* wacom_led_next: gives the next available led with a wacom trigger.
|
||||
*
|
||||
* returns the next available struct wacom_led which has its default trigger
|
||||
|
Loading…
Reference in New Issue
Block a user