forked from luck/tmp_suning_uos_patched
Minor char-misc fixes for 3.3-rc3
Nothing big here, some Kconfig fixes for the MISC_DEVICES config option that was being used incorrectly, and some other minor bug fixes. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iEYEABECAAYFAk80HSAACgkQMUfUDdst+ymFsQCghwKbV9B9z5fgUXYwFQJ/pD2j GhsAn3J2mhhHN/vtSPQAN9Vu59Xb/tCi =VZaE -----END PGP SIGNATURE----- Merge tag 'char-misc-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc Minor char-misc fixes for 3.3-rc3 Nothing big here, some Kconfig fixes for the MISC_DEVICES config option that was being used incorrectly, and some other minor bug fixes. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> * tag 'char-misc-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: mmc: cb710 core: Add missing spin_lock_init for irq_lock of struct cb710_chip cs5535-mfgpt: don't call __init function from __devinit vmw_balloon: fix for a -Wuninitialized warning drivers: misc: Remove MISC_DEVICES config option c2port: fix build error for duramar2150 due to missing header.
This commit is contained in:
Linus Torvalds
commit
ae5cdd405b
|
|
@ -2,24 +2,14 @@
|
|||
# Misc strange devices
|
||||
#
|
||||
|
||||
# This one has to live outside of the MISC_DEVICES conditional,
|
||||
# because it may be selected by drivers/platform/x86/hp_accel.
|
||||
menu "Misc devices"
|
||||
|
||||
config SENSORS_LIS3LV02D
|
||||
tristate
|
||||
depends on INPUT
|
||||
select INPUT_POLLDEV
|
||||
default n
|
||||
|
||||
menuconfig MISC_DEVICES
|
||||
bool "Misc devices"
|
||||
---help---
|
||||
Say Y here to get to see options for device drivers from various
|
||||
different categories. This option alone does not add any kernel code.
|
||||
|
||||
If you say N, all options in this submenu will be skipped and disabled.
|
||||
|
||||
if MISC_DEVICES
|
||||
|
||||
config AD525X_DPOT
|
||||
tristate "Analog Devices Digital Potentiometers"
|
||||
depends on (I2C || SPI) && SYSFS
|
||||
|
|
@ -516,5 +506,4 @@ source "drivers/misc/ti-st/Kconfig"
|
|||
source "drivers/misc/lis3lv02d/Kconfig"
|
||||
source "drivers/misc/carma/Kconfig"
|
||||
source "drivers/misc/altera-stapl/Kconfig"
|
||||
|
||||
endif # MISC_DEVICES
|
||||
endmenu
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
#include <linux/module.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/c2port.h>
|
||||
|
||||
#define DATA_PORT 0x325
|
||||
|
|
|
|||
|
|
@ -245,6 +245,7 @@ static int __devinit cb710_probe(struct pci_dev *pdev,
|
|||
if (err)
|
||||
return err;
|
||||
|
||||
spin_lock_init(&chip->irq_lock);
|
||||
chip->pdev = pdev;
|
||||
chip->iobase = pcim_iomap_table(pdev)[0];
|
||||
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@ static void __init reset_all_timers(void)
|
|||
* In other cases (such as with VSAless OpenFirmware), the system firmware
|
||||
* leaves timers available for us to use.
|
||||
*/
|
||||
static int __init scan_timers(struct cs5535_mfgpt_chip *mfgpt)
|
||||
static int __devinit scan_timers(struct cs5535_mfgpt_chip *mfgpt)
|
||||
{
|
||||
struct cs5535_mfgpt_timer timer = { .chip = mfgpt };
|
||||
unsigned long flags;
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ static bool vmballoon_send_get_target(struct vmballoon *b, u32 *new_target)
|
|||
* fear that guest will need it. Host may reject some pages, we need to
|
||||
* check the return value and maybe submit a different page.
|
||||
*/
|
||||
static bool vmballoon_send_lock_page(struct vmballoon *b, unsigned long pfn,
|
||||
static int vmballoon_send_lock_page(struct vmballoon *b, unsigned long pfn,
|
||||
unsigned int *hv_status)
|
||||
{
|
||||
unsigned long status, dummy;
|
||||
|
|
@ -322,17 +322,17 @@ static bool vmballoon_send_lock_page(struct vmballoon *b, unsigned long pfn,
|
|||
|
||||
pfn32 = (u32)pfn;
|
||||
if (pfn32 != pfn)
|
||||
return false;
|
||||
return -1;
|
||||
|
||||
STATS_INC(b->stats.lock);
|
||||
|
||||
*hv_status = status = VMWARE_BALLOON_CMD(LOCK, pfn, dummy);
|
||||
if (vmballoon_check_status(b, status))
|
||||
return true;
|
||||
return 0;
|
||||
|
||||
pr_debug("%s - ppn %lx, hv returns %ld\n", __func__, pfn, status);
|
||||
STATS_INC(b->stats.lock_fail);
|
||||
return false;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -411,7 +411,7 @@ static int vmballoon_reserve_page(struct vmballoon *b, bool can_sleep)
|
|||
struct page *page;
|
||||
gfp_t flags;
|
||||
unsigned int hv_status;
|
||||
bool locked = false;
|
||||
int locked;
|
||||
flags = can_sleep ? VMW_PAGE_ALLOC_CANSLEEP : VMW_PAGE_ALLOC_NOSLEEP;
|
||||
|
||||
do {
|
||||
|
|
@ -431,7 +431,7 @@ static int vmballoon_reserve_page(struct vmballoon *b, bool can_sleep)
|
|||
|
||||
/* inform monitor */
|
||||
locked = vmballoon_send_lock_page(b, page_to_pfn(page), &hv_status);
|
||||
if (!locked) {
|
||||
if (locked > 0) {
|
||||
STATS_INC(b->stats.refused_alloc);
|
||||
|
||||
if (hv_status == VMW_BALLOON_ERROR_RESET ||
|
||||
|
|
@ -449,7 +449,7 @@ static int vmballoon_reserve_page(struct vmballoon *b, bool can_sleep)
|
|||
if (++b->n_refused_pages >= VMW_BALLOON_MAX_REFUSED)
|
||||
return -EIO;
|
||||
}
|
||||
} while (!locked);
|
||||
} while (locked != 0);
|
||||
|
||||
/* track allocated page */
|
||||
list_add(&page->lru, &b->pages);
|
||||
|
|
|
|||
|
|
@ -477,7 +477,6 @@ config MMC_SDHI
|
|||
config MMC_CB710
|
||||
tristate "ENE CB710 MMC/SD Interface support"
|
||||
depends on PCI
|
||||
select MISC_DEVICES
|
||||
select CB710_CORE
|
||||
help
|
||||
This option enables support for MMC/SD part of ENE CB710/720 Flash
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@ config KS8851
|
|||
select NET_CORE
|
||||
select MII
|
||||
select CRC32
|
||||
select MISC_DEVICES
|
||||
select EEPROM_93CX6
|
||||
---help---
|
||||
SPI driver for Micrel KS8851 SPI attached network chip.
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user