You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Input: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Javier Martinez Canillas <javier@dowhile0.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
committed by
Dmitry Torokhov
parent
78f50c246f
commit
5298cc4cc7
@@ -57,7 +57,7 @@ static const struct pci_device_id emu_tbl[] = {
|
||||
|
||||
MODULE_DEVICE_TABLE(pci, emu_tbl);
|
||||
|
||||
static int __devinit emu_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
static int emu_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
{
|
||||
struct emu *emu;
|
||||
struct gameport *port;
|
||||
|
||||
@@ -78,7 +78,7 @@ static int fm801_gp_open(struct gameport *gameport, int mode)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit fm801_gp_probe(struct pci_dev *pci, const struct pci_device_id *id)
|
||||
static int fm801_gp_probe(struct pci_dev *pci, const struct pci_device_id *id)
|
||||
{
|
||||
struct fm801_gp *gp;
|
||||
struct gameport *port;
|
||||
|
||||
@@ -157,7 +157,7 @@ out:
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int __devinit as5011_configure_chip(struct as5011_device *as5011,
|
||||
static int as5011_configure_chip(struct as5011_device *as5011,
|
||||
const struct as5011_platform_data *plat_dat)
|
||||
{
|
||||
struct i2c_client *client = as5011->i2c_client;
|
||||
@@ -225,8 +225,8 @@ static int __devinit as5011_configure_chip(struct as5011_device *as5011,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit as5011_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int as5011_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
const struct as5011_platform_data *plat_data;
|
||||
struct as5011_device *as5011;
|
||||
|
||||
@@ -78,7 +78,7 @@ static void dc_pad_close(struct input_dev *dev)
|
||||
}
|
||||
|
||||
/* allow the controller to be used */
|
||||
static int __devinit probe_maple_controller(struct device *dev)
|
||||
static int probe_maple_controller(struct device *dev)
|
||||
{
|
||||
static const short btn_bit[32] = {
|
||||
BTN_C, BTN_B, BTN_A, BTN_START, -1, -1, -1, -1,
|
||||
|
||||
@@ -69,7 +69,7 @@ static int adp5520_keys_notifier(struct notifier_block *nb,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit adp5520_keys_probe(struct platform_device *pdev)
|
||||
static int adp5520_keys_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct adp5520_keys_platform_data *pdata = pdev->dev.platform_data;
|
||||
struct input_dev *input;
|
||||
|
||||
@@ -145,7 +145,7 @@ static int adp5588_gpio_direction_output(struct gpio_chip *chip,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devinit adp5588_build_gpiomap(struct adp5588_kpad *kpad,
|
||||
static int adp5588_build_gpiomap(struct adp5588_kpad *kpad,
|
||||
const struct adp5588_kpad_platform_data *pdata)
|
||||
{
|
||||
bool pin_used[ADP5588_MAXGPIO];
|
||||
@@ -170,7 +170,7 @@ static int __devinit adp5588_build_gpiomap(struct adp5588_kpad *kpad,
|
||||
return n_unused;
|
||||
}
|
||||
|
||||
static int __devinit adp5588_gpio_add(struct adp5588_kpad *kpad)
|
||||
static int adp5588_gpio_add(struct adp5588_kpad *kpad)
|
||||
{
|
||||
struct device *dev = &kpad->client->dev;
|
||||
const struct adp5588_kpad_platform_data *pdata = dev->platform_data;
|
||||
@@ -319,7 +319,7 @@ static irqreturn_t adp5588_irq(int irq, void *handle)
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int __devinit adp5588_setup(struct i2c_client *client)
|
||||
static int adp5588_setup(struct i2c_client *client)
|
||||
{
|
||||
const struct adp5588_kpad_platform_data *pdata = client->dev.platform_data;
|
||||
const struct adp5588_gpio_platform_data *gpio_data = pdata->gpio_data;
|
||||
@@ -382,7 +382,7 @@ static int __devinit adp5588_setup(struct i2c_client *client)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __devinit adp5588_report_switch_state(struct adp5588_kpad *kpad)
|
||||
static void adp5588_report_switch_state(struct adp5588_kpad *kpad)
|
||||
{
|
||||
int gpi_stat1 = adp5588_read(kpad->client, GPIO_DAT_STAT1);
|
||||
int gpi_stat2 = adp5588_read(kpad->client, GPIO_DAT_STAT2);
|
||||
@@ -420,8 +420,8 @@ static void __devinit adp5588_report_switch_state(struct adp5588_kpad *kpad)
|
||||
}
|
||||
|
||||
|
||||
static int __devinit adp5588_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int adp5588_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct adp5588_kpad *kpad;
|
||||
const struct adp5588_kpad_platform_data *pdata = client->dev.platform_data;
|
||||
|
||||
@@ -464,7 +464,7 @@ static int adp5589_gpio_direction_output(struct gpio_chip *chip,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int __devinit adp5589_build_gpiomap(struct adp5589_kpad *kpad,
|
||||
static int adp5589_build_gpiomap(struct adp5589_kpad *kpad,
|
||||
const struct adp5589_kpad_platform_data *pdata)
|
||||
{
|
||||
bool pin_used[ADP5589_MAXGPIO];
|
||||
@@ -496,7 +496,7 @@ static int __devinit adp5589_build_gpiomap(struct adp5589_kpad *kpad,
|
||||
return n_unused;
|
||||
}
|
||||
|
||||
static int __devinit adp5589_gpio_add(struct adp5589_kpad *kpad)
|
||||
static int adp5589_gpio_add(struct adp5589_kpad *kpad)
|
||||
{
|
||||
struct device *dev = &kpad->client->dev;
|
||||
const struct adp5589_kpad_platform_data *pdata = dev->platform_data;
|
||||
@@ -641,8 +641,7 @@ static irqreturn_t adp5589_irq(int irq, void *handle)
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int __devinit adp5589_get_evcode(struct adp5589_kpad *kpad,
|
||||
unsigned short key)
|
||||
static int adp5589_get_evcode(struct adp5589_kpad *kpad, unsigned short key)
|
||||
{
|
||||
int i;
|
||||
|
||||
@@ -655,7 +654,7 @@ static int __devinit adp5589_get_evcode(struct adp5589_kpad *kpad,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int __devinit adp5589_setup(struct adp5589_kpad *kpad)
|
||||
static int adp5589_setup(struct adp5589_kpad *kpad)
|
||||
{
|
||||
struct i2c_client *client = kpad->client;
|
||||
const struct adp5589_kpad_platform_data *pdata =
|
||||
@@ -820,7 +819,7 @@ static int __devinit adp5589_setup(struct adp5589_kpad *kpad)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __devinit adp5589_report_switch_state(struct adp5589_kpad *kpad)
|
||||
static void adp5589_report_switch_state(struct adp5589_kpad *kpad)
|
||||
{
|
||||
int gpi_stat_tmp, pin_loc;
|
||||
int i;
|
||||
@@ -860,8 +859,8 @@ static void __devinit adp5589_report_switch_state(struct adp5589_kpad *kpad)
|
||||
input_sync(kpad->input);
|
||||
}
|
||||
|
||||
static int __devinit adp5589_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
static int adp5589_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct adp5589_kpad *kpad;
|
||||
const struct adp5589_kpad_platform_data *pdata =
|
||||
|
||||
@@ -177,7 +177,7 @@ static irqreturn_t bfin_kpad_isr(int irq, void *dev_id)
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int __devinit bfin_kpad_probe(struct platform_device *pdev)
|
||||
static int bfin_kpad_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct bf54x_kpad *bf54x_kpad;
|
||||
struct bfin_kpad_platform_data *pdata = pdev->dev.platform_data;
|
||||
|
||||
@@ -232,7 +232,7 @@ static int ep93xx_keypad_resume(struct device *dev)
|
||||
static SIMPLE_DEV_PM_OPS(ep93xx_keypad_pm_ops,
|
||||
ep93xx_keypad_suspend, ep93xx_keypad_resume);
|
||||
|
||||
static int __devinit ep93xx_keypad_probe(struct platform_device *pdev)
|
||||
static int ep93xx_keypad_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct ep93xx_keypad *keypad;
|
||||
const struct matrix_keymap_data *keymap_data;
|
||||
|
||||
@@ -423,10 +423,10 @@ out:
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int __devinit gpio_keys_setup_key(struct platform_device *pdev,
|
||||
struct input_dev *input,
|
||||
struct gpio_button_data *bdata,
|
||||
const struct gpio_keys_button *button)
|
||||
static int gpio_keys_setup_key(struct platform_device *pdev,
|
||||
struct input_dev *input,
|
||||
struct gpio_button_data *bdata,
|
||||
const struct gpio_keys_button *button)
|
||||
{
|
||||
const char *desc = button->desc ? button->desc : "gpio_keys";
|
||||
struct device *dev = &pdev->dev;
|
||||
@@ -551,7 +551,7 @@ static void gpio_keys_close(struct input_dev *input)
|
||||
/*
|
||||
* Translate OpenFirmware node properties into platform_data
|
||||
*/
|
||||
static struct gpio_keys_platform_data * __devinit
|
||||
static struct gpio_keys_platform_data *
|
||||
gpio_keys_get_devtree_pdata(struct device *dev)
|
||||
{
|
||||
struct device_node *node, *pp;
|
||||
@@ -658,7 +658,7 @@ static void gpio_remove_key(struct gpio_button_data *bdata)
|
||||
gpio_free(bdata->button->gpio);
|
||||
}
|
||||
|
||||
static int __devinit gpio_keys_probe(struct platform_device *pdev)
|
||||
static int gpio_keys_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
const struct gpio_keys_platform_data *pdata = dev_get_platdata(dev);
|
||||
|
||||
@@ -103,8 +103,7 @@ static void gpio_keys_polled_close(struct input_polled_dev *dev)
|
||||
}
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static struct gpio_keys_platform_data * __devinit
|
||||
gpio_keys_polled_get_devtree_pdata(struct device *dev)
|
||||
static struct gpio_keys_platform_data *gpio_keys_polled_get_devtree_pdata(struct device *dev)
|
||||
{
|
||||
struct device_node *node, *pp;
|
||||
struct gpio_keys_platform_data *pdata;
|
||||
@@ -196,7 +195,7 @@ gpio_keys_polled_get_devtree_pdata(struct device *dev)
|
||||
}
|
||||
#endif
|
||||
|
||||
static int __devinit gpio_keys_polled_probe(struct platform_device *pdev)
|
||||
static int gpio_keys_polled_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
const struct gpio_keys_platform_data *pdata = dev_get_platdata(dev);
|
||||
|
||||
@@ -200,7 +200,7 @@ static void hil_do(unsigned char cmd, unsigned char *data, unsigned int len)
|
||||
|
||||
|
||||
/* initialize HIL */
|
||||
static int __devinit hil_keyb_init(void)
|
||||
static int hil_keyb_init(void)
|
||||
{
|
||||
unsigned char c;
|
||||
unsigned int i, kbid;
|
||||
@@ -299,7 +299,7 @@ static void __devexit hil_keyb_exit(void)
|
||||
}
|
||||
|
||||
#if defined(CONFIG_PARISC)
|
||||
static int __devinit hil_probe_chip(struct parisc_device *dev)
|
||||
static int hil_probe_chip(struct parisc_device *dev)
|
||||
{
|
||||
/* Only allow one HIL keyboard */
|
||||
if (hil_dev.dev)
|
||||
|
||||
@@ -413,7 +413,7 @@ open_err:
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
static int __devinit imx_keypad_probe(struct platform_device *pdev)
|
||||
static int imx_keypad_probe(struct platform_device *pdev)
|
||||
{
|
||||
const struct matrix_keymap_data *keymap_data = pdev->dev.platform_data;
|
||||
struct imx_keypad *keypad;
|
||||
|
||||
@@ -179,7 +179,7 @@ static void jornadakbd680_poll(struct input_polled_dev *dev)
|
||||
memcpy(jornadakbd->old_scan, jornadakbd->new_scan, JORNADA_SCAN_SIZE);
|
||||
}
|
||||
|
||||
static int __devinit jornada680kbd_probe(struct platform_device *pdev)
|
||||
static int jornada680kbd_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct jornadakbd *jornadakbd;
|
||||
struct input_polled_dev *poll_dev;
|
||||
|
||||
@@ -94,7 +94,7 @@ static irqreturn_t jornada720_kbd_interrupt(int irq, void *dev_id)
|
||||
return IRQ_HANDLED;
|
||||
};
|
||||
|
||||
static int __devinit jornada720_kbd_probe(struct platform_device *pdev)
|
||||
static int jornada720_kbd_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct jornadakbd *jornadakbd;
|
||||
struct input_dev *input_dev;
|
||||
|
||||
@@ -624,7 +624,7 @@ static ssize_t lm8323_set_disable(struct device *dev,
|
||||
}
|
||||
static DEVICE_ATTR(disable_kp, 0644, lm8323_show_disable, lm8323_set_disable);
|
||||
|
||||
static int __devinit lm8323_probe(struct i2c_client *client,
|
||||
static int lm8323_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct lm8323_platform_data *pdata = client->dev.platform_data;
|
||||
|
||||
@@ -128,7 +128,7 @@ static irqreturn_t lm8333_irq_thread(int irq, void *data)
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int __devinit lm8333_probe(struct i2c_client *client,
|
||||
static int lm8333_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
const struct lm8333_platform_data *pdata = client->dev.platform_data;
|
||||
|
||||
@@ -236,7 +236,7 @@ static void locomokbd_close(struct input_dev *dev)
|
||||
locomo_writel(r, locomokbd->base + LOCOMO_KIC);
|
||||
}
|
||||
|
||||
static int __devinit locomokbd_probe(struct locomo_dev *dev)
|
||||
static int locomokbd_probe(struct locomo_dev *dev)
|
||||
{
|
||||
struct locomokbd *locomokbd;
|
||||
struct input_dev *input_dev;
|
||||
|
||||
@@ -139,7 +139,7 @@ static void lpc32xx_kscan_close(struct input_dev *dev)
|
||||
clk_disable_unprepare(kscandat->clk);
|
||||
}
|
||||
|
||||
static int __devinit lpc32xx_parse_dt(struct device *dev,
|
||||
static int lpc32xx_parse_dt(struct device *dev,
|
||||
struct lpc32xx_kscan_drv *kscandat)
|
||||
{
|
||||
struct device_node *np = dev->of_node;
|
||||
@@ -166,7 +166,7 @@ static int __devinit lpc32xx_parse_dt(struct device *dev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit lpc32xx_kscan_probe(struct platform_device *pdev)
|
||||
static int lpc32xx_kscan_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct lpc32xx_kscan_drv *kscandat;
|
||||
struct input_dev *input;
|
||||
|
||||
@@ -301,8 +301,8 @@ static int matrix_keypad_resume(struct device *dev)
|
||||
static SIMPLE_DEV_PM_OPS(matrix_keypad_pm_ops,
|
||||
matrix_keypad_suspend, matrix_keypad_resume);
|
||||
|
||||
static int __devinit matrix_keypad_init_gpio(struct platform_device *pdev,
|
||||
struct matrix_keypad *keypad)
|
||||
static int matrix_keypad_init_gpio(struct platform_device *pdev,
|
||||
struct matrix_keypad *keypad)
|
||||
{
|
||||
const struct matrix_keypad_platform_data *pdata = keypad->pdata;
|
||||
int i, err;
|
||||
@@ -397,7 +397,7 @@ static void matrix_keypad_free_gpio(struct matrix_keypad *keypad)
|
||||
}
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static struct matrix_keypad_platform_data * __devinit
|
||||
static struct matrix_keypad_platform_data *
|
||||
matrix_keypad_parse_dt(struct device *dev)
|
||||
{
|
||||
struct matrix_keypad_platform_data *pdata;
|
||||
@@ -465,7 +465,7 @@ matrix_keypad_parse_dt(struct device *dev)
|
||||
}
|
||||
#endif
|
||||
|
||||
static int __devinit matrix_keypad_probe(struct platform_device *pdev)
|
||||
static int matrix_keypad_probe(struct platform_device *pdev)
|
||||
{
|
||||
const struct matrix_keypad_platform_data *pdata;
|
||||
struct matrix_keypad *keypad;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user