Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux

Pull device tree changes from Grant Likely:
 "All around device tree changes destined for v3.8.  Aside from the
  documentation updates the highlights in this branch include:

   - Kbuild changes for using CPP with .dts files
   - locking fix from preempt_rt patchset
   - include DT alias names in device uevent
   - Selftest bugfixes and improvements
   - New function for counting phandles stanzas in a property
   - constify argument to of_node_full_name()
   - Various bug fixes

  This tree did also contain a commit to use platform_device_add instead
  of open-coding the device add code, but it caused problems with amba
  devices and needed to be reverted."

* tag 'dt-for-linus' of git://git.secretlab.ca/git/linux: (23 commits)
  Revert "of: use platform_device_add"
  kbuild: limit dtc+cpp include path
  gpio: Make of_count_named_gpios() use new of_count_phandle_with_args()
  of: Create function for counting number of phandles in a property
  of/base: Clean up exit paths for of_parse_phandle_with_args()
  of/selftest: Use selftest() macro throughout
  of/selftest: Fix GPIOs selftest to cover the 7th case
  of: fix recursive locking in of_get_next_available_child()
  documentation/devicetree: Fix a typo in exynos-dw-mshc.txt
  OF: convert devtree lock from rw_lock to raw spinlock
  of/exynos_g2d: Add Bindings for exynos G2D driver
  kbuild: create a rule to run the pre-processor on *.dts files
  input: Extend matrix-keypad device tree binding
  devicetree: Move NS2 LEDs binding into LEDs directory
  of: use platform_device_add
  powerpc/5200: Fix size to request_mem_region() call
  documentation/devicetree: Fix typos
  of: add 'const' to of_node_full_name parameter
  of: Output devicetree alias names in uevent
  DT: add vendor prefixes for Renesas and Toshiba
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c
index 432e66ec3088..cb2e284bd814 100644
--- a/drivers/spi/spi-oc-tiny.c
+++ b/drivers/spi/spi-oc-tiny.c
@@ -54,7 +54,7 @@ struct tiny_spi {
         unsigned int txc, rxc;
         const u8 *txp;
         u8 *rxp;
-        unsigned int gpio_cs_count;
+        int gpio_cs_count;
         int *gpio_cs;
 };
 
@@ -74,7 +74,7 @@ static void tiny_spi_chipselect(struct spi_device *spi, int is_active)
 {
         struct tiny_spi *hw = tiny_spi_to_hw(spi);
 
-        if (hw->gpio_cs_count) {
+        if (hw->gpio_cs_count > 0) {
                 gpio_set_value(hw->gpio_cs[spi->chip_select],
                         (spi->mode & SPI_CS_HIGH) ? is_active : !is_active);
         }
@@ -254,7 +254,7 @@ static int tiny_spi_of_probe(struct platform_device *pdev)
         if (!np)
                 return 0;
         hw->gpio_cs_count = of_gpio_count(np);
-        if (hw->gpio_cs_count) {
+        if (hw->gpio_cs_count > 0) {
                 hw->gpio_cs = devm_kzalloc(&pdev->dev,
                                 hw->gpio_cs_count * sizeof(unsigned int),
                                 GFP_KERNEL);
@@ -352,7 +352,7 @@ static int tiny_spi_probe(struct platform_device *pdev)
                         goto exit_gpio;
                 gpio_direction_output(hw->gpio_cs[i], 1);
         }
-        hw->bitbang.master->num_chipselect = max(1U, hw->gpio_cs_count);
+        hw->bitbang.master->num_chipselect = max(1, hw->gpio_cs_count);
 
         /* register our spi controller */
         err = spi_bitbang_start(&hw->bitbang);