Commit f2999209 authored by Ben Dooks's avatar Ben Dooks Committed by Linus Torvalds
Browse files

mfd: sm501 build fixes when CONFIG_MFD_SM501_GPIO unset 



Fix the build problems if CONFIG_MFD_SM501_GPIO is not set, which is
generally when there is no gpiolib support available as currently happens
on x86 when building PCI SM501.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Tested-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 28130bea

drivers/mfd/sm501.c

+24 −5
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/device.h>

#include <linux/device.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/pci.h>

#include <linux/pci.h>

#include <linux/gpio.h>

#include <linux/i2c-gpio.h>

#include <linux/i2c-gpio.h>





#include <linux/sm501.h>

#include <linux/sm501.h>
@@ -35,6 +34,9 @@ struct sm501_device { 




struct sm501_gpio;

struct sm501_gpio;





#ifdef CONFIG_MFD_SM501_GPIO

#include <linux/gpio.h>



struct sm501_gpio_chip {

struct sm501_gpio_chip {

	struct gpio_chip	gpio;

	struct gpio_chip	gpio;

	struct sm501_gpio	*ourgpio;	/* to get back to parent. */

	struct sm501_gpio	*ourgpio;	/* to get back to parent. */
@@ -50,6 +52,11 @@ struct sm501_gpio { 
	void __iomem		*regs;

	void __iomem		*regs;

	struct resource		*regs_res;

	struct resource		*regs_res;

};

};

#else

struct sm501_gpio {

	/* no gpio support, empty definition for sm501_devdata. */

};

#endif





struct sm501_devdata {

struct sm501_devdata {

	spinlock_t			 reg_lock;

	spinlock_t			 reg_lock;
@@ -1082,6 +1089,9 @@ static void sm501_gpio_remove(struct sm501_devdata *sm) 
	struct sm501_gpio *gpio = &sm->gpio;

	struct sm501_gpio *gpio = &sm->gpio;

	int ret;

	int ret;





	if (!sm->gpio.registered)

		return;



	ret = gpiochip_remove(&gpio->low.gpio);

	ret = gpiochip_remove(&gpio->low.gpio);

	if (ret)

	if (ret)

		dev_err(sm->dev, "cannot remove low chip, cannot tidy up\n");

		dev_err(sm->dev, "cannot remove low chip, cannot tidy up\n");
@@ -1100,6 +1110,11 @@ static inline int sm501_gpio_pin2nr(struct sm501_devdata *sm, unsigned int pin) 
	struct sm501_gpio *gpio = &sm->gpio;

	struct sm501_gpio *gpio = &sm->gpio;

	return pin + (pin < 32) ? gpio->low.gpio.base : gpio->high.gpio.base;

	return pin + (pin < 32) ? gpio->low.gpio.base : gpio->high.gpio.base;

}

}



static inline int sm501_gpio_isregistered(struct sm501_devdata *sm)

{

	return sm->gpio.registered;

}

#else

#else

static inline int sm501_register_gpio(struct sm501_devdata *sm)

static inline int sm501_register_gpio(struct sm501_devdata *sm)

{

{
@@ -1114,6 +1129,11 @@ static inline int sm501_gpio_pin2nr(struct sm501_devdata *sm, unsigned int pin) 
{

{

	return -1;

	return -1;

}

}



static inline int sm501_gpio_isregistered(struct sm501_devdata *sm)

{

	return 0;

}

#endif

#endif





static int sm501_register_gpio_i2c_instance(struct sm501_devdata *sm,

static int sm501_register_gpio_i2c_instance(struct sm501_devdata *sm,
@@ -1330,8 +1350,8 @@ static int sm501_init_dev(struct sm501_devdata *sm) 
	}

	}





	if (pdata->gpio_i2c != NULL && pdata->gpio_i2c_nr > 0) {

	if (pdata->gpio_i2c != NULL && pdata->gpio_i2c_nr > 0) {

		if (!sm->gpio.registered)

		if (!sm501_gpio_isregistered(sm))

			dev_err(sm->dev, "no gpio registered for i2c gpio.\n");

			dev_err(sm->dev, "no gpio available for i2c gpio.\n");

		else

		else

			sm501_register_gpio_i2c(sm, pdata);

			sm501_register_gpio_i2c(sm, pdata);

	}

	}
@@ -1643,7 +1663,6 @@ static void sm501_dev_remove(struct sm501_devdata *sm) 




	device_remove_file(sm->dev, &dev_attr_dbg_regs);

	device_remove_file(sm->dev, &dev_attr_dbg_regs);





	if (sm->gpio.registered)

	sm501_gpio_remove(sm);

	sm501_gpio_remove(sm);

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE