Skip to content

Commit

Permalink
gpio: remove use of __devinit
Browse files Browse the repository at this point in the history 
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.

Signed-off-by: Bill Pemberton <[email protected]>
Cc: Grant Likely <[email protected]>
Cc: Peter Tyser <[email protected]>
Cc: Santosh Shilimkar <[email protected]>
Cc: Kevin Hilman <[email protected]>
Acked-by: Linus Walleij <[email protected]>
Acked-by: Mark Brown <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
@wfp5p @gregkh
wfp5p authored and gregkh committed Nov 28, 2012
1 parent 8283c4f commit 3836309
Show file tree
Hide file tree
Showing 55 changed files with 76 additions and 76 deletions.
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-74x164.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ static int gen_74x164_direction_output(struct gpio_chip *gc,
return 0;
}

static int __devinit gen_74x164_probe(struct spi_device *spi)
static int gen_74x164_probe(struct spi_device *spi)
{
struct gen_74x164_chip *chip;
struct gen_74x164_chip_platform_data *pdata;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-ab8500.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ static void ab8500_gpio_irq_remove(struct ab8500_gpio *ab8500_gpio)
}
}

static int __devinit ab8500_gpio_probe(struct platform_device *pdev)
static int ab8500_gpio_probe(struct platform_device *pdev)
{
struct ab8500_platform_data *ab8500_pdata =
dev_get_platdata(pdev->dev.parent);
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-adnp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ static void adnp_irq_teardown(struct adnp *adnp)
irq_domain_remove(adnp->domain);
}

static __devinit int adnp_i2c_probe(struct i2c_client *client,
static int adnp_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct device_node *np = client->dev.of_node;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-adp5520.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ static int adp5520_gpio_direction_output(struct gpio_chip *chip,
return ret;
}

static int __devinit adp5520_gpio_probe(struct platform_device *pdev)
static int adp5520_gpio_probe(struct platform_device *pdev)
{
struct adp5520_gpio_platform_data *pdata = pdev->dev.platform_data;
struct adp5520_gpio *dev;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-adp5588.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ static void adp5588_irq_teardown(struct adp5588_gpio *dev)
}
#endif /* CONFIG_GPIO_ADP5588_IRQ */

static int __devinit adp5588_gpio_probe(struct i2c_client *client,
static int adp5588_gpio_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct adp5588_gpio_platform_data *pdata = client->dev.platform_data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-arizona.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ static struct gpio_chip template_chip = {
.can_sleep = 1,
};

static int __devinit arizona_gpio_probe(struct platform_device *pdev)
static int arizona_gpio_probe(struct platform_device *pdev)
{
struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
struct arizona_pdata *pdata = arizona->dev->platform_data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-cs5535.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ static struct cs5535_gpio_chip cs5535_gpio_chip = {
},
};

static int __devinit cs5535_gpio_probe(struct platform_device *pdev)
static int cs5535_gpio_probe(struct platform_device *pdev)
{
struct resource *res;
int err = -EIO;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-da9052.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ static struct gpio_chip reference_gp __devinitdata = {
.base = -1,
};

static int __devinit da9052_gpio_probe(struct platform_device *pdev)
static int da9052_gpio_probe(struct platform_device *pdev)
{
struct da9052_gpio *gpio;
struct da9052_pdata *pdata;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-em.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ static void em_gio_irq_domain_cleanup(struct em_gio_priv *p)
/* FIXME: irq domain wants to be freed! */
}

static int __devinit em_gio_probe(struct platform_device *pdev)
static int em_gio_probe(struct platform_device *pdev)
{
struct gpio_em_config *pdata = pdev->dev.platform_data;
struct em_gio_priv *p;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-ep93xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ static int ep93xx_gpio_add_bank(struct bgpio_chip *bgc, struct device *dev,
return gpiochip_add(&bgc->gc);
}

static int __devinit ep93xx_gpio_probe(struct platform_device *pdev)
static int ep93xx_gpio_probe(struct platform_device *pdev)
{
struct ep93xx_gpio *ep93xx_gpio;
struct resource *res;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-generic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ static void __iomem *bgpio_map(struct platform_device *pdev,
return ret;
}

static int __devinit bgpio_pdev_probe(struct platform_device *pdev)
static int bgpio_pdev_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct resource *r;
Expand Down
6 changes: 3 additions & 3 deletions drivers/gpio/gpio-ich.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ static void ichx_gpio_set(struct gpio_chip *chip, unsigned nr, int val)
ichx_write_bit(GPIO_LVL, nr, val, 0);
}

static void __devinit ichx_gpiolib_setup(struct gpio_chip *chip)
static void ichx_gpiolib_setup(struct gpio_chip *chip)
{
chip->owner = THIS_MODULE;
chip->label = DRV_NAME;
Expand Down Expand Up @@ -313,7 +313,7 @@ static struct ichx_desc intel5_desc = {
.ngpio = 76,
};

static int __devinit ichx_gpio_request_regions(struct resource *res_base,
static int ichx_gpio_request_regions(struct resource *res_base,
const char *name, u8 use_gpio)
{
int i;
Expand Down Expand Up @@ -353,7 +353,7 @@ static void ichx_gpio_release_regions(struct resource *res_base, u8 use_gpio)
}
}

static int __devinit ichx_gpio_probe(struct platform_device *pdev)
static int ichx_gpio_probe(struct platform_device *pdev)
{
struct resource *res_base, *res_pm;
int err;
Expand Down
6 changes: 3 additions & 3 deletions drivers/gpio/gpio-janz-ttl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ static void ttl_set_value(struct gpio_chip *gpio, unsigned offset, int value)
spin_unlock(&mod->lock);
}

static void __devinit ttl_write_reg(struct ttl_module *mod, u8 reg, u16 val)
static void ttl_write_reg(struct ttl_module *mod, u8 reg, u16 val)
{
iowrite16be(reg, &mod->regs->control);
iowrite16be(val, &mod->regs->control);
}

static void __devinit ttl_setup_device(struct ttl_module *mod)
static void ttl_setup_device(struct ttl_module *mod)
{
/* reset the device to a known state */
iowrite16be(0x0000, &mod->regs->control);
Expand All @@ -140,7 +140,7 @@ static void __devinit ttl_setup_device(struct ttl_module *mod)
ttl_write_reg(mod, MASTER_CONF_CTL, CONF_PAE | CONF_PBE | CONF_PCE);
}

static int __devinit ttl_probe(struct platform_device *pdev)
static int ttl_probe(struct platform_device *pdev)
{
struct janz_platform_data *pdata;
struct device *dev = &pdev->dev;
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpio/gpio-langwell.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ static const struct dev_pm_ops lnw_gpio_pm_ops = {
.runtime_idle = lnw_gpio_runtime_idle,
};

static int __devinit lnw_gpio_probe(struct pci_dev *pdev,
static int lnw_gpio_probe(struct pci_dev *pdev,
const struct pci_device_id *id)
{
void *base;
Expand Down Expand Up @@ -435,7 +435,7 @@ static struct pci_driver lnw_gpio_driver = {
};


static int __devinit wp_gpio_probe(struct platform_device *pdev)
static int wp_gpio_probe(struct platform_device *pdev)
{
struct lnw_gpio *lnw;
struct gpio_chip *gc;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-lpc32xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ static int lpc32xx_of_xlate(struct gpio_chip *gc,
return gpiospec->args[1];
}

static int __devinit lpc32xx_gpio_probe(struct platform_device *pdev)
static int lpc32xx_gpio_probe(struct platform_device *pdev)
{
int i;

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-max7300.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static int max7300_i2c_read(struct device *dev, unsigned int reg)
return i2c_smbus_read_byte_data(client, reg);
}

static int __devinit max7300_probe(struct i2c_client *client,
static int max7300_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct max7301 *ts;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-max7301.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ static int max7301_spi_read(struct device *dev, unsigned int reg)
return word & 0xff;
}

static int __devinit max7301_probe(struct spi_device *spi)
static int max7301_probe(struct spi_device *spi)
{
struct max7301 *ts;
int ret;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-max730x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ static void max7301_set(struct gpio_chip *chip, unsigned offset, int value)
mutex_unlock(&ts->lock);
}

int __devinit __max730x_probe(struct max7301 *ts)
int __max730x_probe(struct max7301 *ts)
{
struct device *dev = ts->dev;
struct max7301_platform_data *pdata;
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpio/gpio-max732x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ static void max732x_irq_teardown(struct max732x_chip *chip)
}
#endif

static int __devinit max732x_setup_gpio(struct max732x_chip *chip,
static int max732x_setup_gpio(struct max732x_chip *chip,
const struct i2c_device_id *id,
unsigned gpio_start)
{
Expand Down Expand Up @@ -574,7 +574,7 @@ static int __devinit max732x_setup_gpio(struct max732x_chip *chip,
return port;
}

static int __devinit max732x_probe(struct i2c_client *client,
static int max732x_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct max732x_platform_data *pdata;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-mc33880.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ static void mc33880_set(struct gpio_chip *chip, unsigned offset, int value)
mutex_unlock(&mc->lock);
}

static int __devinit mc33880_probe(struct spi_device *spi)
static int mc33880_probe(struct spi_device *spi)
{
struct mc33880 *mc;
struct mc33880_platform_data *pdata;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-mcp23s08.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev,

#ifdef CONFIG_I2C

static int __devinit mcp230xx_probe(struct i2c_client *client,
static int mcp230xx_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct mcp23s08_platform_data *pdata;
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpio/gpio-ml-ioh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ static irqreturn_t ioh_gpio_handler(int irq, void *dev_id)
return ret;
}

static __devinit void ioh_gpio_alloc_generic_chip(struct ioh_gpio *chip,
static void ioh_gpio_alloc_generic_chip(struct ioh_gpio *chip,
unsigned int irq_start, unsigned int num)
{
struct irq_chip_generic *gc;
Expand All @@ -406,7 +406,7 @@ static __devinit void ioh_gpio_alloc_generic_chip(struct ioh_gpio *chip,
IRQ_NOREQUEST | IRQ_NOPROBE, 0);
}

static int __devinit ioh_gpio_probe(struct pci_dev *pdev,
static int ioh_gpio_probe(struct pci_dev *pdev,
const struct pci_device_id *id)
{
int ret;
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpio/gpio-mpc5200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ mpc52xx_wkup_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
return 0;
}

static int __devinit mpc52xx_wkup_gpiochip_probe(struct platform_device *ofdev)
static int mpc52xx_wkup_gpiochip_probe(struct platform_device *ofdev)
{
struct mpc52xx_gpiochip *chip;
struct mpc52xx_gpio_wkup __iomem *regs;
Expand Down Expand Up @@ -308,7 +308,7 @@ mpc52xx_simple_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
return 0;
}

static int __devinit mpc52xx_simple_gpiochip_probe(struct platform_device *ofdev)
static int mpc52xx_simple_gpiochip_probe(struct platform_device *ofdev)
{
struct mpc52xx_gpiochip *chip;
struct gpio_chip *gc;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-msic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ static void msic_gpio_irq_handler(unsigned irq, struct irq_desc *desc)
chip->irq_eoi(data);
}

static int __devinit platform_msic_gpio_probe(struct platform_device *pdev)
static int platform_msic_gpio_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct intel_msic_gpio_pdata *pdata = dev->platform_data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-msm-v2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ static struct irq_chip msm_gpio_irq_chip = {
.irq_set_wake = msm_gpio_irq_set_wake,
};

static int __devinit msm_gpio_probe(struct platform_device *dev)
static int msm_gpio_probe(struct platform_device *dev)
{
int i, irq, ret;

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-mvebu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ static struct of_device_id mvebu_gpio_of_match[] __devinitdata = {
};
MODULE_DEVICE_TABLE(of, mvebu_gpio_of_match);

static int __devinit mvebu_gpio_probe(struct platform_device *pdev)
static int mvebu_gpio_probe(struct platform_device *pdev)
{
struct mvebu_gpio_chip *mvchip;
const struct of_device_id *match;
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpio/gpio-mxc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ static void __init mxc_gpio_init_gc(struct mxc_gpio_port *port, int irq_base)
IRQ_NOREQUEST, 0);
}

static void __devinit mxc_gpio_get_hw(struct platform_device *pdev)
static void mxc_gpio_get_hw(struct platform_device *pdev)
{
const struct of_device_id *of_id =
of_match_device(mxc_gpio_dt_ids, &pdev->dev);
Expand Down Expand Up @@ -395,7 +395,7 @@ static int mxc_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
return irq_find_mapping(port->domain, offset);
}

static int __devinit mxc_gpio_probe(struct platform_device *pdev)
static int mxc_gpio_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct mxc_gpio_port *port;
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-mxs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ static const struct of_device_id mxs_gpio_dt_ids[] = {
};
MODULE_DEVICE_TABLE(of, mxs_gpio_dt_ids);

static int __devinit mxs_gpio_probe(struct platform_device *pdev)
static int mxs_gpio_probe(struct platform_device *pdev)
{
const struct of_device_id *of_id =
of_match_device(mxs_gpio_dt_ids, &pdev->dev);
Expand Down
6 changes: 3 additions & 3 deletions drivers/gpio/gpio-omap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ static void omap_gpio_mod_init(struct gpio_bank *bank)
dev_err(bank->dev, "Could not get gpio dbck\n");
}

static __devinit void
static void
omap_mpuio_alloc_gc(struct gpio_bank *bank, unsigned int irq_start,
unsigned int num)
{
Expand Down Expand Up @@ -1041,7 +1041,7 @@ omap_mpuio_alloc_gc(struct gpio_bank *bank, unsigned int irq_start,
IRQ_NOREQUEST | IRQ_NOPROBE, 0);
}

static void __devinit omap_gpio_chip_init(struct gpio_bank *bank)
static void omap_gpio_chip_init(struct gpio_bank *bank)
{
int j;
static int gpio;
Expand Down Expand Up @@ -1089,7 +1089,7 @@ static void __devinit omap_gpio_chip_init(struct gpio_bank *bank)

static const struct of_device_id omap_gpio_match[];

static int __devinit omap_gpio_probe(struct platform_device *pdev)
static int omap_gpio_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct device_node *node = dev->of_node;
Expand Down
6 changes: 3 additions & 3 deletions drivers/gpio/gpio-pca953x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ pca953x_get_alt_pdata(struct i2c_client *client, int *gpio_base, u32 *invert)
}
#endif

static int __devinit device_pca953x_init(struct pca953x_chip *chip, u32 invert)
static int device_pca953x_init(struct pca953x_chip *chip, u32 invert)
{
int ret;

Expand All @@ -621,7 +621,7 @@ static int __devinit device_pca953x_init(struct pca953x_chip *chip, u32 invert)
return ret;
}

static int __devinit device_pca957x_init(struct pca953x_chip *chip, u32 invert)
static int device_pca957x_init(struct pca953x_chip *chip, u32 invert)
{
int ret;
u32 val = 0;
Expand Down Expand Up @@ -652,7 +652,7 @@ static int __devinit device_pca957x_init(struct pca953x_chip *chip, u32 invert)
return ret;
}

static int __devinit pca953x_probe(struct i2c_client *client,
static int pca953x_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct pca953x_platform_data *pdata;
Expand Down
Loading

0 comments on commit 3836309

Please sign in to comment.