mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
[PATCH] Driver Core: drivers/i2c/chips/w83781d.c - drivers/s390/block/dcssblk.c: update device attribute callbacks
Signed-off-by: Yani Ioannou <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
a5099cfc2e
commit
e404e274f6
24 changed files with 100 additions and 99 deletions
|
|
@ -140,7 +140,7 @@ static void pnp_release_card(struct device *dmdev)
|
|||
}
|
||||
|
||||
|
||||
static ssize_t pnp_show_card_name(struct device *dmdev, char *buf)
|
||||
static ssize_t pnp_show_card_name(struct device *dmdev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
char *str = buf;
|
||||
struct pnp_card *card = to_pnp_card(dmdev);
|
||||
|
|
@ -150,7 +150,7 @@ static ssize_t pnp_show_card_name(struct device *dmdev, char *buf)
|
|||
|
||||
static DEVICE_ATTR(name,S_IRUGO,pnp_show_card_name,NULL);
|
||||
|
||||
static ssize_t pnp_show_card_ids(struct device *dmdev, char *buf)
|
||||
static ssize_t pnp_show_card_ids(struct device *dmdev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
char *str = buf;
|
||||
struct pnp_card *card = to_pnp_card(dmdev);
|
||||
|
|
|
|||
|
|
@ -205,7 +205,7 @@ static void pnp_print_option(pnp_info_buffer_t *buffer, char *space,
|
|||
}
|
||||
|
||||
|
||||
static ssize_t pnp_show_options(struct device *dmdev, char *buf)
|
||||
static ssize_t pnp_show_options(struct device *dmdev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct pnp_dev *dev = to_pnp_dev(dmdev);
|
||||
struct pnp_option * independent = dev->independent;
|
||||
|
|
@ -236,7 +236,7 @@ static ssize_t pnp_show_options(struct device *dmdev, char *buf)
|
|||
static DEVICE_ATTR(options,S_IRUGO,pnp_show_options,NULL);
|
||||
|
||||
|
||||
static ssize_t pnp_show_current_resources(struct device *dmdev, char *buf)
|
||||
static ssize_t pnp_show_current_resources(struct device *dmdev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct pnp_dev *dev = to_pnp_dev(dmdev);
|
||||
int i, ret;
|
||||
|
|
@ -308,7 +308,7 @@ static ssize_t pnp_show_current_resources(struct device *dmdev, char *buf)
|
|||
extern struct semaphore pnp_res_mutex;
|
||||
|
||||
static ssize_t
|
||||
pnp_set_current_resources(struct device * dmdev, const char * ubuf, size_t count)
|
||||
pnp_set_current_resources(struct device * dmdev, struct device_attribute *attr, const char * ubuf, size_t count)
|
||||
{
|
||||
struct pnp_dev *dev = to_pnp_dev(dmdev);
|
||||
char *buf = (void *)ubuf;
|
||||
|
|
@ -444,7 +444,7 @@ pnp_set_current_resources(struct device * dmdev, const char * ubuf, size_t count
|
|||
static DEVICE_ATTR(resources,S_IRUGO | S_IWUSR,
|
||||
pnp_show_current_resources,pnp_set_current_resources);
|
||||
|
||||
static ssize_t pnp_show_current_ids(struct device *dmdev, char *buf)
|
||||
static ssize_t pnp_show_current_ids(struct device *dmdev, struct device_attribute *attr, char *buf)
|
||||
{
|
||||
char *str = buf;
|
||||
struct pnp_dev *dev = to_pnp_dev(dmdev);
|
||||
|
|
|
|||
Loading…
Reference in a new issue